undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sg/test-rebase-editor-fix'

Browse Source 
Test fix.

* sg/test-rebase-editor-fix:
  t/lib-rebase.sh: support explicit 'pick' commands in 'fake_editor.sh'
This commit is contained in:
Junio C Hamano 2018-08-27 14:33:50 -07:00
commit 926107db6d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/lib-rebase.sh
View File

@ -14,8 +14,8 @@
# specified line. # specified line.
# #
# "<cmd> <lineno>" -- add a line with the specified command # "<cmd> <lineno>" -- add a line with the specified command
# ("squash", "fixup", "edit", "reword" or "drop") and the SHA1 taken # ("pick", "squash", "fixup", "edit", "reword" or "drop") and the
# from the specified line. # SHA1 taken from the specified line.
# #
# "exec_cmd_with_args" -- add an "exec cmd with args" line. # "exec_cmd_with_args" -- add an "exec cmd with args" line.
# #
@ -47,7 +47,7 @@ set_fake_editor () {
action=pick action=pick
for line in $FAKE_LINES; do for line in $FAKE_LINES; do
case $line in case $line in
squash|fixup|edit|reword|drop) pick|squash|fixup|edit|reword|drop)
action="$line";; action="$line";;
exec*) exec*)
echo "$line" | sed 's/_/ /g' >> "$1";; echo "$line" | sed 's/_/ /g' >> "$1";;