From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Nov 2018 06:50:22 +0000 (+0900)
Subject: Merge branch 'sg/test-rebase-editor-fix'
X-Git-Tag: v2.20.0-rc0~64
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b3635c15b504a0bb73b12669382fb9b8248b6d58

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

* sg/test-rebase-editor-fix:
t3404-rebase-interactive: test abbreviated commands
---

b3635c15b504a0bb73b12669382fb9b8248b6d58
diff --cc t/lib-rebase.sh
index f6c45ee08f,0c93d00bdd..7ea30e5006
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@@ -47,9 -47,9 +47,9 @@@ set_fake_editor () 
  	action=pick
  	for line in $FAKE_LINES; do
  		case $line in
- 		pick|squash|fixup|edit|reword|drop)
+ 		pick|p|squash|s|fixup|f|edit|e|reword|r|drop|d)
  			action="$line";;
- 		exec*|break|b)
 -		exec_*|x_*)
++		exec_*|x_*|break|b)
  			echo "$line" | sed 's/_/ /g' >> "$1";;
  		"#")
  			echo '# comment' >> "$1";;