summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-02-17 10:15:18 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-02-17 10:15:18 -0800
commit9f55a77777a43880882bad43daa8eac076ad9c48 (patch)
tree3a1ed5c5f6de7d64132ed702ab0b0668ce05e07f /t
parentMerge branch 'mh/deref-symref-over-helper-transport' (diff)
parentrebase -i: use full object name internally throughout the script (diff)
downloadtgif-9f55a77777a43880882bad43daa8eac076ad9c48.tar.xz
Merge branch 'ks/rebase-i-abbrev'
The insn sheet "git rebase -i" creates did not fully honor core.abbrev settings. * ks/rebase-i-abbrev: rebase -i: use full object name internally throughout the script
Diffstat (limited to 't')
-rwxr-xr-xt/t3404-rebase-interactive.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 8197ed29a9..a31f7e0430 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -1039,4 +1039,11 @@ test_expect_success 'short SHA-1 collide' '
)
'
+test_expect_success 'respect core.abbrev' '
+ git config core.abbrev 12 &&
+ set_cat_todo_editor &&
+ test_must_fail git rebase -i HEAD~4 >todo-list &&
+ test 4 = $(grep -c "pick [0-9a-f]\{12,\}" todo-list)
+'
+
test_done