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

[BUG] rebase -i with empty commits + exec

From
Stefan Beller <sbeller@google.com>
Date
Aug 22, 2017, 23:08 UTC
Message-ID
<CAGZ79kYinci-OWXV2VfScLPcUDCHyhSb=7TxTWUWHPnKV5PuDA@mail.gmail.com>

Currently I am working on a longer series, for which I decided to keep track of progress in an empty commit. This empty commit is in the middle of the series (to divide the commits into two sets, the foundation that I consider stable and the later parts that are not as stable for my development, they contain things that may be useful)

Then I invoked "git rebase -i <base> -x make" to see in which shape the series is.

The editor opened proposing the following instruction sheet, which in my opinion is buggy:

    pick 1234 some commit
    exec make
    pick 2345 another commit
    exec make
    pick 3456 third commit
    # pick 4567 empty commit
    exec make
    pick 5678  yet another commit
    exec make

I think the lines of the empty commit and the following exec should be swapped, because that exec should work on the third commit. Maybe we'd want to see another commented exec:

    pick 1234 some commit
    exec make
    pick 2345 another commit
    exec make
    pick 3456 third commit
    exec make
    # pick 4567 empty commit
    # exec make <- unsure about this line
    pick 5678  yet another commit
    exec make
Thoughts?
Next: Stephan Beyer
Message 1 of 9 in “[BUG] rebase -i with empty commits + exec”
  1. Stefan BellerAug 22, 2017
  2. [BUG] rebase -i with only empty commitsStephan Beyer, Aug 23, 2017
  3. Johannes SchindelinAug 23, 2017
  4. Stephan BeyerAug 23, 2017
  5. Stefan BellerAug 23, 2017
  6. Stephan BeyerAug 23, 2017
  7. Junio C HamanoAug 23, 2017
  8. Philip OakleyAug 23, 2017
  9. Phillip WoodAug 24, 2017

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.