[PATCH v19 02/20] t3432: use git-reflog to inspect the reflog for HEAD
From: Han-Wen Nienhuys via GitGitGadget <hidden>
Date: 2020-06-29 21:14:51
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Han-Wen Nienhuys via GitGitGadget <hidden>
Date: 2020-06-29 21:14:51
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Han-Wen Nienhuys <redacted> Signed-off-by: Han-Wen Nienhuys <redacted> --- t/t3432-rebase-fast-forward.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/t/t3432-rebase-fast-forward.sh b/t/t3432-rebase-fast-forward.sh
index 6f0452c0ea..22afeb8ccd 100755
--- a/t/t3432-rebase-fast-forward.sh
+++ b/t/t3432-rebase-fast-forward.sh@@ -60,15 +60,16 @@ test_rebase_same_head_ () { fi && oldhead=\$(git rev-parse HEAD) && test_when_finished 'git reset --hard \$oldhead' && - cp .git/logs/HEAD expect && + git reflog HEAD > expect && git rebase$flag $* >stdout && + git reflog HEAD > actual && if test $what = work then old=\$(wc -l <expect) && - test_line_count '-gt' \$old .git/logs/HEAD + test_line_count '-gt' \$old actual elif test $what = noop then - test_cmp expect .git/logs/HEAD + test_cmp expect actual fi && newhead=\$(git rev-parse HEAD) && if test $cmp = same
--
gitgitgadget