{"thread":{"id":"24691","subject":"Black smoke from git rebase -i exec","startedAt":"2010-08-10T13:08:02Z","lastAt":"2011-01-26T07:33:14Z","messageCount":38,"participants":["Ævar Arnfjörð Bjarmason","Matthieu Moy","Johannes Sixt","Junio C Hamano","Jonathan Nieder","Nicolas Sebrecht","Thomas Rast","Johannes Schindelin","Joshua Jensen","Jay Soffian"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"147633","messageId":"AANLkTikCgSNRipTbjiL+uPOqCL3WXwn08_QV=UJ7EwvT@mail.gmail.com","threadId":"24691","inReplyTo":null,"subject":"Black smoke from git rebase -i exec","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-10T13:08:02Z","receivedAt":"2010-08-10T13:08:02Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"There's some black smoke in pu after the git rebase -i series was\napplied: http://smoke.git.nix.is/app/projects/report_details/14\n\nNote: just the t3404-rebase-interactive.sh failure, not\nt6040-tracking-info.sh, that's something else.\n\nHere's the --verbose output from the test, hopefully that helps, if\nnot I can supply some additional info:\n\n Initialized empty Git repository in\n/tmp/build-and-install-git-olpK/t/trash\ndirectory.t3404-rebase-interactive/.git/\n expecting success:\n \ttest_commit A file1 &&\n \ttest_commit B file1 &&\n \ttest_commit C file2 &&\n \ttest_commit D file1 &&\n \ttest_commit E file3 &&\n \tgit checkout -b branch1 A &&\n \ttest_commit F file4 &&\n \ttest_commit G file1 &&\n \ttest_commit H file5 &&\n \tgit checkout -b branch2 F &&\n \ttest_commit I file6\n \tgit checkout -b conflict-branch A &&\n \tfor n in one two three four\n \tdo\n \t\ttest_commit $n conflict\n \tdone &&\n \tgit checkout -b no-conflict-branch A &&\n \tfor n in J K L M\n \tdo\n \t\ttest_commit $n file$n\n \tdone &&\n \tgit checkout -b no-ff-branch A &&\n \tfor n in N O P\n \tdo\n \t\ttest_commit $n file$n\n \tdone\n\n [master (root-commit) 6e62bf8] A\n Author: A U Thor \n 1 files changed, 1 insertions(+), 0 deletions(-)\n create mode 100644 file1\n [master 313fe96] B\n Author: A U Thor \n 1 files changed, 1 insertions(+), 1 deletions(-)\n [master d0f65f2] C\n Author: A U Thor \n 1 files changed, 1 insertions(+), 0 deletions(-)\n create mode 100644 file2\n [master 0547e3f] D\n Author: A U Thor \n 1 files changed, 1 insertions(+), 1 deletions(-)\n [master 8f99a4f] E\n Author: A U Thor \n 1 files changed, 1 insertions(+), 0 deletions(-)\n create mode 100644 file3\n Switched to a new branch 'branch1'\n [branch1 cfefd94] F\n Author: A U Thor \n 1 files changed, 1 insertions(+), 0 deletions(-)\n create mode 100644 file4\n [branch1 83751a6] G\n Author: A U Thor \n 1 files changed, 1 insertions(+), 1 deletions(-)\n [branch1 4373208] H\n Author: A U Thor \n 1 files changed, 1 insertions(+), 0 deletions(-)\n create mode 100644 file5\n Switched to a new branch 'branch2'\n [branch2 615be62] I\n Author: A U Thor \n 1 files changed, 1 insertions(+), 0 deletions(-)\n create mode 100644 file6\n Switched to a new branch 'conflict-branch'\n [conflict-branch b895952] one\n Author: A U Thor \n 1 files changed, 1 insertions(+), 0 deletions(-)\n create mode 100644 conflict\n [conflict-branch 766a798] two\n Author: A U Thor \n 1 files changed, 1 insertions(+), 1 deletions(-)\n [conflict-branch 1eadf03] three\n Author: A U Thor \n 1 files changed, 1 insertions(+), 1 deletions(-)\n [conflict-branch f91a2b3] four\n Author: A U Thor \n 1 files changed, 1 insertions(+), 1 deletions(-)\n Switched to a new branch 'no-conflict-branch'\n [no-conflict-branch 808874f] J\n Author: A U Thor \n 1 files changed, 1 insertions(+), 0 deletions(-)\n create mode 100644 fileJ\n [no-conflict-branch 265b89e] K\n Author: A U Thor \n 1 files changed, 1 insertions(+), 0 deletions(-)\n create mode 100644 fileK\n [no-conflict-branch 6b0f5e6] L\n Author: A U Thor \n 1 files changed, 1 insertions(+), 0 deletions(-)\n create mode 100644 fileL\n [no-conflict-branch 3389558] M\n Author: A U Thor \n 1 files changed, 1 insertions(+), 0 deletions(-)\n create mode 100644 fileM\n Switched to a new branch 'no-ff-branch'\n [no-ff-branch 53b4423] N\n Author: A U Thor \n 1 files changed, 1 insertions(+), 0 deletions(-)\n create mode 100644 fileN\n [no-ff-branch cc47714] O\n Author: A U Thor \n 1 files changed, 1 insertions(+), 0 deletions(-)\n create mode 100644 fileO\n [no-ff-branch faef1a5] P\n Author: A U Thor \n 1 files changed, 1 insertions(+), 0 deletions(-)\n create mode 100644 fileP\n ok 1 - setup\n\n expecting success:\n \tgit checkout master &&\n \tFAKE_LINES=\"1 exec_touch_touch-one 2 exec_touch_touch-two\nexec_false exec_touch_touch-three 3 4\n \t\texec_touch_\\\"touch-file__name_with_spaces\\\";_touch_touch-after-semicolon\n5\" \\\n \t\ttest_must_fail git rebase -i A &&\n \ttest -f touch-one &&\n \ttest -f touch-two &&\n \t! test -f touch-three &&\n \ttest $(git rev-parse C) = $(git rev-parse HEAD) || {\n \t\techo \"Stopped at wrong revision:\"\n \t\techo \"($(git describe --tags HEAD) instead of C)\"\n \t\tfalse\n \t} &&\n \tgit rebase --continue &&\n \ttest -f touch-three &&\n \ttest -f \"touch-file name with spaces\" &&\n \ttest -f touch-after-semicolon &&\n \ttest $(git rev-parse master) = $(git rev-parse HEAD) || {\n \t\techo \"Stopped at wrong revision:\"\n \t\techo \"($(git describe --tags HEAD) instead of master)\"\n \t\tfalse\n \t} &&\n \trm -f touch-*\n\n Switched to a new branch 'master'\n Rebasing (4/4)\nSuccessfully rebased and updated refs/heads/master.\n Stopped at wrong revision:\n (E instead of C)\n Stopped at wrong revision:\n (E instead of master)\n not ok - 2 rebase -i with the exec command\n #\t\n #\t\tgit checkout master &&\n #\t\tFAKE_LINES=\"1 exec_touch_touch-one 2 exec_touch_touch-two\nexec_false exec_touch_touch-three 3 4\n #\t\t\texec_touch_\\\"touch-file__name_with_spaces\\\";_touch_touch-after-semicolon\n5\" \\\n #\t\t\ttest_must_fail git rebase -i A &&\n #\t\ttest -f touch-one &&\n #\t\ttest -f touch-two &&\n #\t\t! test -f touch-three &&\n #\t\ttest $(git rev-parse C) = $(git rev-parse HEAD) || {\n #\t\t\techo \"Stopped at wrong revision:\"\n #\t\t\techo \"($(git describe --tags HEAD) instead of C)\"\n #\t\t\tfalse\n #\t\t} &&\n #\t\tgit rebase --continue &&\n #\t\ttest -f touch-three &&\n #\t\ttest -f \"touch-file name with spaces\" &&\n #\t\ttest -f touch-after-semicolon &&\n #\t\ttest $(git rev-parse master) = $(git rev-parse HEAD) || {\n #\t\t\techo \"Stopped at wrong revision:\"\n #\t\t\techo \"($(git describe --tags HEAD) instead of master)\"\n #\t\t\tfalse\n #\t\t} &&\n #\t\trm -f touch-*\n #\t\n\n expecting success:\n \tgit checkout master &&\n \tmkdir subdir && cd subdir &&\n \tFAKE_LINES=\"1 exec_touch_touch-subdir\" \\\n \t\tgit rebase -i HEAD^ &&\n \tcd .. &&\n \ttest -f touch-subdir &&\n \trm -fr subdir\n\n Already on 'master'\n rebase -i script before editing:\n pick 8f99a4f E\n\n rebase -i script after editing:\n pick 8f99a4f E\n exec touch touch-subdir\n Rebasing (2/2)\nExecuting: touch touch-subdir\n Successfully rebased and updated refs/heads/master.\n ok 3 - rebase -i with the exec command runs from tree root\n\n expecting success:\n \tgit checkout master &&\n \tFAKE_LINES=\"exec_echo_foo_>file1 1\" \\\n \t\ttest_must_fail git rebase -i HEAD^ &&\n \ttest $(git rev-parse master^) = $(git rev-parse HEAD) || {\n \t\techo \"Stopped at wrong revision:\"\n \t\techo \"($(git describe --tags HEAD) instead of master^)\"\n \t\tfalse\n \t} &&\n \tgit reset --hard &&\n \tgit rebase --continue\n\n Already on 'master'\n Rebasing (1/1)\nSuccessfully rebased and updated refs/heads/master.\n Stopped at wrong revision:\n (E instead of master^)\n not ok - 4 rebase -i with the exec command checks tree cleanness\n #\t\n #\t\tgit checkout master &&\n #\t\tFAKE_LINES=\"exec_echo_foo_>file1 1\" \\\n #\t\t\ttest_must_fail git rebase -i HEAD^ &&\n #\t\ttest $(git rev-parse master^) = $(git rev-parse HEAD) || {\n #\t\t\techo \"Stopped at wrong revision:\"\n #\t\t\techo \"($(git describe --tags HEAD) instead of master^)\"\n #\t\t\tfalse\n #\t\t} &&\n #\t\tgit reset --hard &&\n #\t\tgit rebase --continue\n #\t\n\n # failed 2 among 4 test(s)\n 1..4\n\n(I modified the test to only run the failing tests)\n"},{"id":"147636","messageId":"vpqlj8ezizq.fsf@bauges.imag.fr","threadId":"24691","inReplyTo":"AANLkTikCgSNRipTbjiL+uPOqCL3WXwn08_QV=UJ7EwvT@mail.gmail.com","subject":"Re: Black smoke from git rebase -i exec","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2010-08-10T13:37:29Z","receivedAt":"2010-08-10T13:37:29Z","isPatch":false,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Ævar Arnfjörð Bjarmason writes:\n\n> There's some black smoke in pu after the git rebase -i series was\n> applied: http://smoke.git.nix.is/app/projects/report_details/14\n\nStrange, I can't reproduce this on my box (tried on RHEL x86_64 and\nDebian i686).\n\n> expecting success:\n...\n> \trm -f touch-*\n>\n> Switched to a new branch 'master'\n\nAt this point, I get \n\nrebase -i script before editing:\npick 313fe96 B\npick d0f65f2 C\npick 0547e3f D\npick 8f99a4f E\n\nrebase -i script after editing:\npick 313fe96 B\nexec touch touch-one\npick d0f65f2 C\nexec touch touch-two\nexec false\nexec touch touch-three\npick 0547e3f D\npick 8f99a4f E\nexec touch \"touch-file name with spaces\"; touch touch-after-semicolon\n\nwhich you don't seem to get on your side. I get the same as you if I\ncomment out the \"set_fake_editor\" line at the top of the script. So, I\nsuspect there's something very wrong that prevents it from doing its\njob.\n\nCan you add some debug\n\necho \"$EDITOR\"\necho \"$FAKE_EDITOR\"\n\nsomewhere in the test to see what happens?\n\n> Rebasing (4/4)\n> Successfully rebased and updated refs/heads/master.\n> Stopped at wrong revision:\n> (E instead of C)\n> Stopped at wrong revision:\n> (E instead of master)\n\n(here, it's definitely doing as if the todolist had not been edited)\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"147638","messageId":"AANLkTimgRu=nRFpO+QW758SWbQ+Vs+8gtpAc4N-cNWr6@mail.gmail.com","threadId":"24691","inReplyTo":"vpqlj8ezizq.fsf@bauges.imag.fr","subject":"Re: Black smoke from git rebase -i exec","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-10T13:57:05Z","receivedAt":"2010-08-10T13:57:05Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Tue, Aug 10, 2010 at 13:37, Matthieu Moy\n wrote:\n> Ęvar Arnfjörš Bjarmason writes:\n>\n>> There's some black smoke in pu after the git rebase -i series was\n>> applied: http://smoke.git.nix.is/app/projects/report_details/14\n>\n> Strange, I can't reproduce this on my box (tried on RHEL x86_64 and\n> Debian i686).\n\nHi. The issue appears to be that there's some non-POSIX code in your\npatch (but I didn't check what). The test works for me with bash, but\nfails with dash (which is the Debian testing /bin/sh).\n\nCan you try with dash or some other non-bash POSIX shell and see if it\nfails?\n"},{"id":"147639","messageId":"4C615E5E.3090301@viscovery.net","threadId":"24691","inReplyTo":"AANLkTimgRu=nRFpO+QW758SWbQ+Vs+8gtpAc4N-cNWr6@mail.gmail.com","subject":"Re: Black smoke from git rebase -i exec","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2010-08-10T14:12:46Z","receivedAt":"2010-08-10T14:12:46Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 8/10/2010 15:57, schrieb Ævar Arnfjörð Bjarmason:\n> On Tue, Aug 10, 2010 at 13:37, Matthieu Moy\n> wrote:\n>> Ęvar Arnfjörš Bjarmason writes:\n>>\n>>> There's some black smoke in pu after the git rebase -i series was\n>>> applied: http://smoke.git.nix.is/app/projects/report_details/14\n>>\n>> Strange, I can't reproduce this on my box (tried on RHEL x86_64 and\n>> Debian i686).\n> \n> Hi. The issue appears to be that there's some non-POSIX code in your\n> patch (but I didn't check what). The test works for me with bash, but\n> fails with dash (which is the Debian testing /bin/sh).\n> \n> Can you try with dash or some other non-bash POSIX shell and see if it\n> fails?\n\nThe culprit is commands like these:\n\n\tFAKE_LINES=\"exec_echo_foo_>file1 1\" \\\n\t\ttest_must_fail git rebase -i HEAD^ &&\n\nYou cannot apply single-command-export if the command is a shell function.\nYou must rewrite this as:\n\n\t(\n\t\texport FAKE_LINES=\"...\" &&\n\t\ttest_must_fail git rebase ....\n\t) &&\n\n-- Hannes\n"},{"id":"147641","messageId":"AANLkTikVB6VoSy3=XVHqGsA7xH39MgDwh2hDnX89enfM@mail.gmail.com","threadId":"24691","inReplyTo":"4C615E5E.3090301@viscovery.net","subject":"Re: Black smoke from git rebase -i exec","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-10T14:16:38Z","receivedAt":"2010-08-10T14:16:38Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Tue, Aug 10, 2010 at 14:12, Johannes Sixt wrote:\n> You cannot apply single-command-export if the command is a shell function.\n> You must rewrite this as:\n>\n>        (\n>                export FAKE_LINES=\"...\" &&\n>                test_must_fail git rebase ....\n>        ) &&\n\nExcept that's not portable either, it should be:\n\n FAKE_LINES=\"...\" &&\n export FAKE_LINES &&\n\ttest_must_fail git rebase ...\n\nSee the other examples in t3404-rebase-interactive.sh\n"},{"id":"147646","messageId":"vpq62ziv788.fsf@bauges.imag.fr","threadId":"24691","inReplyTo":"AANLkTikVB6VoSy3=XVHqGsA7xH39MgDwh2hDnX89enfM@mail.gmail.com","subject":"Re: Black smoke from git rebase -i exec","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2010-08-10T15:05:11Z","receivedAt":"2010-08-10T15:05:11Z","isPatch":false,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Ævar Arnfjörð Bjarmason writes:\n\n> On Tue, Aug 10, 2010 at 14:12, Johannes Sixt wrote:\n>> You cannot apply single-command-export if the command is a shell function.\n>> You must rewrite this as:\n>>\n>>        (\n>>                export FAKE_LINES=\"...\" &&\n>>                test_must_fail git rebase ....\n>>        ) &&\n>\n> Except that's not portable either, it should be:\n>\n> FAKE_LINES=\"...\" &&\n> export FAKE_LINES &&\n> \ttest_must_fail git rebase ...\n>\n> See the other examples in t3404-rebase-interactive.sh\n\nYes, I had found this. New patch comming soon.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"147649","messageId":"1281453472-29835-1-git-send-email-Matthieu.Moy@imag.fr","threadId":"24691","inReplyTo":"vpq62ziv788.fsf@bauges.imag.fr","subject":"[PATCH 1/2 (fix broken test)] rebase -i: add exec command to launch a shell command","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@imag.fr","sentAt":"2010-08-10T15:17:51Z","receivedAt":"2010-08-10T15:17:51Z","isPatch":true,"sender":{"key":"git@matthieu-moy.fr","avatar":"https://avatars.githubusercontent.com/u/14709?v=4"},"body":"The typical usage pattern would be to run a test (or simply a compilation\ncommand) at given points in history.\n\nThe shell command is ran (from the worktree root), and the rebase is\nstopped when the command fails, to give the user an opportunity to fix\nthe problem before continuing with \"git rebase --continue\".\n\nThis needs a little rework of skip_unnecessary_picks, which wasn't robust\nenough to deal with lines like\n\n exec >\"file name with many spaces\"\n\nin the todolist. The new version extracts command, sha1 and rest from\neach line, but outputs the line itself verbatim to avoid changing the\nwhitespace layout.\n\nSigned-off-by: Matthieu Moy \n---\nThis fixes the non-POSIX behavior of the tests found by Ævar Arnfjörð\nBjarmason (FAKE_LINES=foo test_must_fail ... does not work).\n\nAlso, I replaced \"touch foo\" with \">foo\" and found a small bug. This\nis the skip_unnecessary_picks of the commit message and of the patch\nbelow.\n\n Documentation/git-rebase.txt | 24 ++++++++++++++++\n git-rebase--interactive.sh | 38 +++++++++++++++++++++++--\n t/lib-rebase.sh | 2 +\n t/t3404-rebase-interactive.sh | 61 +++++++++++++++++++++++++++++++++++++++++\n 4 files changed, 122 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex be23ad2..9c68b66 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -459,6 +459,30 @@ sure that the current HEAD is \"B\", and call\n $ git rebase -i -p --onto Q O\n -----------------------------\n \n+Reordering and editing commits usually creates untested intermediate\n+steps. You may want to check that your history editing did not break\n+anything by running a test, or at least recompiling at intermediate\n+points in history by using the \"exec\" command (shortcut \"x\"). You may\n+do so by creating a todo list like this one:\n+\n+-------------------------------------------\n+pick deadbee Implement feature XXX\n+fixup f1a5c00 Fix to feature XXX\n+exec make\n+pick c0ffeee The oneline of the next commit\n+edit deadbab The oneline of the commit after\n+exec cd subdir; make test\n+...\n+-------------------------------------------\n+\n+The interactive rebase will stop when a command fails (i.e. exits with\n+non-0 status) to give you an opportunity to fix the problem. You can\n+continue with `git rebase --continue`.\n+\n+The \"exec\" command launches the command in a shell (the one specified\n+in `$SHELL`, or the default shell if `$SHELL` is not set), so you can\n+use shell features (like \"cd\", \">\", \";\" ...). The command is run from\n+the root of the working tree.\n \n SPLITTING COMMITS\n -----------------\ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex b94c2a0..bf49b5b 100755\n--- a/git-rebase--interactive.sh\n+++ b/git-rebase--interactive.sh\n@@ -537,6 +537,34 @@ do_next () {\n \t\tesac\n \t\trecord_in_rewritten $sha1\n \t\t;;\n+\tx|\"exec\")\n+\t\tread -r command rest < \"$TODO\"\n+\t\tmark_action_done\n+\t\tprintf 'Executing: %s\\n' \"$rest\"\n+\t\t# \"exec\" command doesn't take a sha1 in the todo-list.\n+\t\t# => can't just use $sha1 here.\n+\t\tgit rev-parse --verify HEAD > \"$DOTEST\"/stopped-sha\n+\t\t${SHELL:-@SHELL_PATH@} -c \"$rest\" # Actual execution\n+\t\tstatus=$?\n+\t\tif test \"$status\" -ne 0\n+\t\tthen\n+\t\t\twarn \"Execution failed: $rest\"\n+\t\t\twarn \"You can fix the problem, and then run\"\n+\t\t\twarn\n+\t\t\twarn \"\tgit rebase --continue\"\n+\t\t\twarn\n+\t\t\texit \"$status\"\n+\t\tfi\n+\t\t# Run in subshell because require_clean_work_tree can die.\n+\t\tif ! (require_clean_work_tree)\n+\t\tthen\n+\t\t\twarn \"Commit or stash your changes, and then run\"\n+\t\t\twarn\n+\t\t\twarn \"\tgit rebase --continue\"\n+\t\t\twarn\n+\t\t\texit 1\n+\t\tfi\n+\t\t;;\n \t*)\n \t\twarn \"Unknown command: $command $sha1 $rest\"\n \t\tif git rev-parse --verify -q \"$sha1\" >/dev/null\n@@ -591,10 +619,13 @@ do_rest () {\n # skip picking commits whose parents are unchanged\n skip_unnecessary_picks () {\n \tfd=3\n-\twhile read -r command sha1 rest\n+\twhile read -r line\n \tdo\n+\t\tcommand=$(echo \"$line\" | sed 's/ */ /' | cut -d ' ' -f 1)\n+\t\tsha1=$(echo \"$line\" | sed 's/ */ /' | cut -d ' ' -f 2)\n+\t\trest=$(echo \"$line\" | sed 's/ */ /' | cut -d ' ' -f 3-)\n \t\t# fd=3 means we skip the command\n-\t\tcase \"$fd,$command,$(git rev-parse --verify --quiet $sha1^)\" in\n+\t\tcase \"$fd,$command,$(git rev-parse --verify --quiet \"$sha1\"^)\" in\n \t\t3,pick,\"$ONTO\"*|3,p,\"$ONTO\"*)\n \t\t\t# pick a commit whose parent is current $ONTO -> skip\n \t\t\tONTO=$sha1\n@@ -606,7 +637,7 @@ skip_unnecessary_picks () {\n \t\t\tfd=1\n \t\t\t;;\n \t\tesac\n-\t\tprintf '%s\\n' \"$command${sha1:+ }$sha1${rest:+ }$rest\" >&$fd\n+\t\techo \"$line\" >&$fd\n \tdone <\"$TODO\" >\"$TODO.new\" 3>>\"$DONE\" &&\n \tmv -f \"$TODO\".new \"$TODO\" &&\n \tcase \"$(peek_next_command)\" in\n@@ -957,6 +988,7 @@ first and then run 'git rebase --continue' again.\"\n # e, edit = use commit, but stop for amending\n # s, squash = use commit, but meld into previous commit\n # f, fixup = like \"squash\", but discard this commit's log message\n+# x , exec = Run a shell command , and stop if it fails\n #\n # If you remove a line here THAT COMMIT WILL BE LOST.\n # However, if you remove everything, the rebase will be aborted.\ndiff --git a/t/lib-rebase.sh b/t/lib-rebase.sh\nindex 6aefe27..6ccf797 100644\n--- a/t/lib-rebase.sh\n+++ b/t/lib-rebase.sh\n@@ -47,6 +47,8 @@ for line in $FAKE_LINES; do\n \tcase $line in\n \tsquash|fixup|edit|reword)\n \t\taction=\"$line\";;\n+\texec*)\n+\t\techo \"$line\" | sed 's/_/ /g' >> \"$1\";;\n \t\"#\")\n \t\techo '# comment' >> \"$1\";;\n \t\">\")\ndiff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh\nindex 9f03ce6..93b181e 100755\n--- a/t/t3404-rebase-interactive.sh\n+++ b/t/t3404-rebase-interactive.sh\n@@ -64,6 +64,67 @@ test_expect_success 'setup' '\n \tdone\n '\n \n+# \"exec\" commands are ran with the user shell by default, but this may\n+# be non-POSIX. For example, if SHELL=zsh then \">file\" doesn't work\n+# to create a file. Unseting SHELL avoids such non-portable behavior\n+# in tests.\n+SHELL=\n+\n+test_expect_success 'rebase -i with the exec command' '\n+\tgit checkout master &&\n+\t(\n+\tFAKE_LINES=\"1 exec_>touch-one\n+\t\t2 exec_>touch-two exec_false exec_>touch-three\n+\t\t3 4 exec_>\\\"touch-file__name_with_spaces\\\";_>touch-after-semicolon 5\" &&\n+\texport FAKE_LINES &&\n+\ttest_must_fail git rebase -i A\n+\t) &&\n+\ttest -f touch-one &&\n+\ttest -f touch-two &&\n+\t! test -f touch-three &&\n+\ttest $(git rev-parse C) = $(git rev-parse HEAD) || {\n+\t\techo \"Stopped at wrong revision:\"\n+\t\techo \"($(git describe --tags HEAD) instead of C)\"\n+\t\tfalse\n+\t} &&\n+\tgit rebase --continue &&\n+\ttest -f touch-three &&\n+\ttest -f \"touch-file name with spaces\" &&\n+\ttest -f touch-after-semicolon &&\n+\ttest $(git rev-parse master) = $(git rev-parse HEAD) || {\n+\t\techo \"Stopped at wrong revision:\"\n+\t\techo \"($(git describe --tags HEAD) instead of master)\"\n+\t\tfalse\n+\t} &&\n+\trm -f touch-*\n+'\n+\n+test_expect_success 'rebase -i with the exec command runs from tree root' '\n+\tgit checkout master &&\n+\tmkdir subdir && cd subdir &&\n+\tFAKE_LINES=\"1 exec_>touch-subdir\" \\\n+\t\tgit rebase -i HEAD^ &&\n+\tcd .. &&\n+\ttest -f touch-subdir &&\n+\trm -fr subdir\n+'\n+\n+test_expect_success 'rebase -i with the exec command checks tree cleanness' '\n+\tgit checkout master &&\n+\t(\n+\tFAKE_LINES=\"exec_echo_foo_>file1 1\" &&\n+\texport FAKE_LINES &&\n+\ttest_must_fail git rebase -i HEAD^\n+\t) &&\n+\ttest $(git rev-parse master^) = $(git rev-parse HEAD) || {\n+\t\techo \"Stopped at wrong revision:\"\n+\t\techo \"($(git describe --tags HEAD) instead of master^)\"\n+\t\tfalse\n+\t} &&\n+\tgit reset --hard &&\n+\tgit rebase --continue\n+'\n+\n test_expect_success 'no changes are a nop' '\n \tgit checkout branch2 &&\n \tgit rebase -i F &&\n-- \n1.7.2.1.52.g95e25.dirty\n"},{"id":"147648","messageId":"1281453472-29835-2-git-send-email-Matthieu.Moy@imag.fr","threadId":"24691","inReplyTo":"vpq62ziv788.fsf@bauges.imag.fr","subject":"[PATCH 2/2] test-lib: user-friendly alternatives to test [-d|-f|-e]","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@imag.fr","sentAt":"2010-08-10T15:17:52Z","receivedAt":"2010-08-10T15:17:52Z","isPatch":true,"sender":{"key":"git@matthieu-moy.fr","avatar":"https://avatars.githubusercontent.com/u/14709?v=4"},"body":"The helper functions are implemented, documented, and used in a few\nplaces to validate them, but not everywhere to avoid useless code churn.\n\nSigned-off-by: Matthieu Moy \n---\nJust resending this one since I modified PATCH 1/2 and had to resolve\na minor conflict.\n\n t/README | 7 +++++++\n t/t3404-rebase-interactive.sh | 18 +++++++++---------\n t/t3407-rebase-abort.sh | 6 +++---\n t/test-lib.sh | 32 ++++++++++++++++++++++++++++++++\n 4 files changed, 51 insertions(+), 12 deletions(-)\n\ndiff --git a/t/README b/t/README\nindex 0d1183c..410499a 100644\n--- a/t/README\n+++ b/t/README\n@@ -467,6 +467,13 @@ library for your script to use.\n file. This behaves like \"cmp\" but produces more\n helpful output when the test is run with \"-v\" option.\n \n+ - test_path_is_file []\n+ test_path_is_dir []\n+ test_path_is_missing []\n+\n+ Check whether a file/directory exists or doesn't. will\n+ be displayed if the test fails.\n+\n - test_when_finished