Merge branch 'dl/reset-doc-no-wrt-abbrev'

[thirdparty/git.git] / t / t3400-rebase.sh

diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 3e73f7584ce7d3a23e7e75d0f71bd595f5f822a3..460d0523be6f35e4477a010edd365c1f8fbd431c 100755 (executable)
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -59,6 +59,14 @@ test_expect_success 'rebase against master' '
        git rebase master
 '
 
+test_expect_success 'rebase sets ORIG_HEAD to pre-rebase state' '
+       git checkout -b orig-head topic &&
+       pre="$(git rev-parse --verify HEAD)" &&
+       git rebase master &&
+       test_cmp_rev "$pre" ORIG_HEAD &&
+       ! test_cmp_rev "$pre" HEAD
+'
+
 test_expect_success 'rebase, with <onto> and <upstream> specified as :/quuxery' '
        test_when_finished "git branch -D torebase" &&
        git checkout -b torebase my-topic-branch^ &&