aboutsummaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-28 10:34:40 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-28 10:34:40 -0700
commitc97268c822077ba414f90f6ba357fab170bb3986 (patch)
tree344e1158e92b2eb88adcb12589ba174966fd1e43 /t/t3404-rebase-interactive.sh
parent8c6d1f9807c67532e7fb545a944b064faff0f70b (diff)
parentcbcd2cbd5942cc890c1a1125593e1108c3e6a077 (diff)
downloadgit-c97268c822077ba414f90f6ba357fab170bb3986.tar.gz
git-c97268c822077ba414f90f6ba357fab170bb3986.tar.xz
Merge branch 'js/rebase-i-tests'
A few tests that specifically target "git rebase -i" have been added. * js/rebase-i-tests: rebase -i: we allow extra spaces after fixup!/squash! rebase -i: demonstrate a bug with --autosquash t3404: add a test for the --gpg-sign option
Diffstat (limited to 't/t3404-rebase-interactive.sh')
-rwxr-xr-xt/t3404-rebase-interactive.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 3532c482f..197914bbd 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -1281,4 +1281,12 @@ test_expect_success 'editor saves as CR/LF' '
)
'
+SQ="'"
+test_expect_success 'rebase -i --gpg-sign=<key-id>' '
+ set_fake_editor &&
+ FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" HEAD^ \
+ >out 2>err &&
+ grep "$SQ-S\"S I Gner\"$SQ" err
+'
+
test_done