summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-08-19 23:14:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-08-19 23:14:48 (GMT)
commit4499a42d0cb774c1ed6953d03226b7cbe0756af7 (patch)
tree6a548106ec6d081166b5b20480887b4b97249a09 /t/t3404-rebase-interactive.sh
parent6cceea19eb6b86a4a293c92fe9653ccc8bb71526 (diff)
parent5da69c0dacb65cf80fc80b53e652fefad7469bf1 (diff)
downloadgit-4499a42d0cb774c1ed6953d03226b7cbe0756af7.zip
git-4499a42d0cb774c1ed6953d03226b7cbe0756af7.tar.gz
git-4499a42d0cb774c1ed6953d03226b7cbe0756af7.tar.bz2
Merge branch 'ak/sequencer-fix-find-uniq-abbrev'
Ring buffer with size 4 used for bin-hex translation resulted in a wrong object name in the sequencer's todo output, which has been corrected. * ak/sequencer-fix-find-uniq-abbrev: rebase -i: fix possibly wrong onto hash in todo
Diffstat (limited to 't/t3404-rebase-interactive.sh')
-rwxr-xr-xt/t3404-rebase-interactive.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 61d2028..07a1617 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -1791,6 +1791,12 @@ test_expect_success 'correct error message for commit --amend after empty pick'
test_i18ngrep "middle of a rebase -- cannot amend." err
'
+test_expect_success 'todo has correct onto hash' '
+ GIT_SEQUENCE_EDITOR=cat git rebase -i no-conflict-branch~4 no-conflict-branch >actual &&
+ onto=$(git rev-parse --short HEAD~4) &&
+ test_i18ngrep "^# Rebase ..* onto $onto" actual
+'
+
# This must be the last test in this file
test_expect_success '$EDITOR and friends are unchanged' '
test_editor_unchanged