diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-12 14:09:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-12 14:09:56 -0700 |
| commit | 0188f32304d916ec6a2443937e36421e8da9a8fd (patch) | |
| tree | ab6152cabcf1ac6c61882b7c78daff20f8aa0c2d /t/t3404-rebase-interactive.sh | |
| parent | 53860f03927fea9c46d64b556a06fffe4b46e41f (diff) | |
| parent | d0ab058498cf3f1862de76b419abc0b67fabbd83 (diff) | |
| download | git-0188f32304d916ec6a2443937e36421e8da9a8fd.tar.gz git-0188f32304d916ec6a2443937e36421e8da9a8fd.tar.xz | |
Merge branch 'dt/reflog-tests'
Tests that assume how reflogs are represented on the filesystem too
much have been corrected.
* dt/reflog-tests:
tests: remove some direct access to .git/logs
t/t7509: remove unnecessary manipulation of reflog
Diffstat (limited to 't/t3404-rebase-interactive.sh')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 9d26064ab..d26e3f57d 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -961,13 +961,13 @@ test_expect_success 'rebase -i produces readable reflog' ' set_fake_editor && git rebase -i --onto I F branch-reflog-test && cat >expect <<-\EOF && - rebase -i (start): checkout I - rebase -i (pick): G - rebase -i (pick): H rebase -i (finish): returning to refs/heads/branch-reflog-test + rebase -i (pick): H + rebase -i (pick): G + rebase -i (start): checkout I EOF - tail -n 4 .git/logs/HEAD | - sed -e "s/.* //" >actual && + git reflog -n4 HEAD | + sed "s/[^:]*: //" >actual && test_cmp expect actual ' |