git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCHv6 1/3] git-rebase -i: add command "drop" to remove a commit

From
Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr>
Date
Jun 23, 2015, 19:18 UTC
Message-ID
<392249968.731834.1435087097209.JavaMail.zimbra@ensimag.grenoble-inp.fr>
In-Reply-To
<vpq1th2p7ka.fsf@anie.imag.fr>
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
Show 32 quoted lines
> Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr> writes:
> 
> > Eric Sunshine <sunshine@sunshineco.com> writes:
> >> > +test_rebase_end () {
> >> > +       test_when_finished "git checkout master &&
> >> > +       git branch -D $1 &&
> >> > +       test_might_fail git rebase --abort" &&
> >> > +       git checkout -b $1 master
> >> > +}
> >>
> >> The way this is indented makes it difficult to see that lines 2 and 3
> >> are continuations of 1. Perhaps format it like this instead?
> >>
> >>     test_rebase_end () {
> >>         test_when_finished "git checkout master &&
> >>             git branch -D $1 &&
> >>             test_might_fail git rebase --abort" &&
> >>         git checkout -b $1 master
> >>     }
> >
> > I completely agree with you, moreover it was indented like this before.
> > I'll change it in my local version for now.
> 
> Perhaps to avoid confusion, stg like:
> 
>         test_when_finished "
>                 ... &&
>                 ...
>         " &&
>         git checkout
> 
> (the closing " alone on its line)
I think that the indentation on its own is enough to avoid confusion
Show 6 quoted lines
> test_rebase_end () {
> 	test_when_finished "git checkout master &&
> 		git branch -D $1 &&
> 		test_might_fail git rebase --abort" &&
> 	git checkout -b $1 master
> }
but your idea is fine as well, so I'm ok with either way.

Thanks, Rémi

Previous: Matthieu MoyNext: Matthieu Moy
Message 9 of 16 in “[PATCHv6 1/3] git-rebase -i: add command "drop" to remove a commit”
  1. Galan RémiJun 22, 2015
  2. 2/3 git rebase -i: warn about removed commitsGalan Rémi, Jun 22, 2015
  3. 3/3 git rebase -i: add static check for commands and SHA-1Galan Rémi, Jun 22, 2015
  4. Junio C HamanoJun 23, 2015
  5. Remi Galan AlfonsoJun 23, 2015
  6. Eric SunshineJun 23, 2015
  7. Remi Galan AlfonsoJun 23, 2015
  8. Matthieu MoyJun 23, 2015
  9. Remi Galan AlfonsoJun 23, 2015
  10. Matthieu MoyJun 23, 2015
  11. Junio C HamanoJun 23, 2015
  12. Remi Galan AlfonsoJun 23, 2015
  13. Eric SunshineJun 23, 2015
  14. Junio C HamanoJun 23, 2015
  15. Remi Galan AlfonsoJun 23, 2015
  16. Junio C HamanoJun 23, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.