diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-27 14:33:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-27 14:33:50 -0700 |
| commit | 926107db6dfba9e1b64dd2ab5f2e1d078acd1009 (patch) | |
| tree | 9d7f1f13af36358cfd0138be0620088e291dea1c /t | |
| parent | Merge branch 'jk/hashcmp-optim-for-2.19' (diff) | |
| parent | t/lib-rebase.sh: support explicit 'pick' commands in 'fake_editor.sh' (diff) | |
| download | git-926107db6dfba9e1b64dd2ab5f2e1d078acd1009.tar.gz git-926107db6dfba9e1b64dd2ab5f2e1d078acd1009.zip | |
Merge branch 'sg/test-rebase-editor-fix'
Test fix.
* sg/test-rebase-editor-fix:
t/lib-rebase.sh: support explicit 'pick' commands in 'fake_editor.sh'
Diffstat (limited to 't')
| -rw-r--r-- | t/lib-rebase.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh index 25a77ee5cb..2ca9fb69d6 100644 --- a/t/lib-rebase.sh +++ b/t/lib-rebase.sh @@ -14,8 +14,8 @@ # specified line. # # "<cmd> <lineno>" -- add a line with the specified command -# ("squash", "fixup", "edit", "reword" or "drop") and the SHA1 taken -# from the specified line. +# ("pick", "squash", "fixup", "edit", "reword" or "drop") and the +# SHA1 taken from the specified line. # # "exec_cmd_with_args" -- add an "exec cmd with args" line. # @@ -47,7 +47,7 @@ set_fake_editor () { action=pick for line in $FAKE_LINES; do case $line in - squash|fixup|edit|reword|drop) + pick|squash|fixup|edit|reword|drop) action="$line";; exec*) echo "$line" | sed 's/_/ /g' >> "$1";; |