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

git rebase regression: cannot pass a shell expression directly to --exec

From
EREric Rannaud <eric.rannaud@gmail.com>
Date
May 15, 2017, 18:08 UTC
Message-ID
<CA+zRj8X3OoejQVhUHD9wvv60jpTEZy06qa0y7TtodfBa1q5bnA@mail.gmail.com>
Hi all,
It used to be possible to run a sequence like:
  foo() { echo X; }
  export -f foo
  git rebase --exec foo HEAD~10
Since upgrading to 2.13.0, I had to update my scripts to run:
  git rebase --exec "bash -c foo" HEAD~10

I'm not sure if this was an intended change. Bisecting with the following script:

  #!/usr/bin/env bash
  make -j8 || exit 3
  function foo() {
          echo OK
  }
  export -f foo
  pushd tmp
  ../git --exec-path=.. rebase --exec foo HEAD^^
  ret=$?
  # Cleanup if failure
  ../git --exec-path=.. rebase --abort &> /dev/null
  popd
  exit $ret
It points to this commit:
commit 18633e1a22a68bbe8e6311a1039d13ebbf6fd041 (refs/bisect/bad)
Author: Johannes Schindelin <johannes.schindelin@gmx.de>
Date:   Thu Feb 9 23:23:11 2017 +0100
    rebase -i: use the rebase--helper builtin
    Now that the sequencer learned to process a "normal" interactive rebase,
    we use it. The original shell script is still used for "non-normal"
    interactive rebases, i.e. when --root or --preserve-merges was passed.
    Please note that the --root option (via the $squash_onto variable) needs
    special handling only for the very first command, hence it is still okay
    to use the helper upon continue/skip.
    Also please note that the --no-ff setting is volatile, i.e. when the
    interactive rebase is interrupted at any stage, there is no record of
    it. Therefore, we have to pass it from the shell script to the
    rebase--helper.
    Note: the test t3404 had to be adjusted because the the error messages
    produced by the sequencer comply with our current convention to start with
    a lower-case letter.
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>

Thanks, Eric

Next: Jeff King
Message 1 of 29 in “git rebase regression: cannot pass a shell expression directly to --exec”
  1. Eric RannaudMay 15, 2017
  2. Jeff KingMay 16, 2017
  3. Jeff KingMay 16, 2017
  4. Jonathan NiederMay 16, 2017
  5. Jeff KingMay 16, 2017
  6. Eric RannaudMay 16, 2017
  7. Brandon WilliamsMay 16, 2017
  8. Jeff KingMay 16, 2017
  9. Brandon WilliamsMay 16, 2017
  10. Linus TorvaldsMay 16, 2017
  11. [TANGENT] run-command: use vfork instead of forkEric Wong, May 16, 2017
  12. Linus TorvaldsMay 16, 2017
  13. Brandon WilliamsMay 16, 2017
  14. Johannes SchindelinMay 16, 2017
  15. Linus TorvaldsMay 16, 2017
  16. Jonathan NiederMay 16, 2017
  17. Junio C HamanoMay 16, 2017
  18. Jeff KingMay 16, 2017
  19. Jeff KingMay 16, 2017
  20. Eric RannaudMay 16, 2017
  21. Johannes SchindelinMay 16, 2017
  22. Johannes SchindelinMay 16, 2017
  23. Jeff KingMay 16, 2017
  24. Eric RannaudMay 16, 2017
  25. Kevin DaudtMay 16, 2017
  26. Eric RannaudMay 16, 2017
  27. Jeff KingMay 16, 2017
  28. Eric RannaudMay 16, 2017
  29. Jeff KingMay 16, 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.