diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-13 01:20:35 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-13 01:20:36 +0300 |
| commit | 9d21a968b2018983fa28a3e41dcb1d7546e0c27c (patch) | |
| tree | 150d346d126a89fb62b8aa60509139ae6d146905 /t/t1411-reflog-show.sh | |
| parent | 699d47e1d2777ad1c2a867671e35daa821769f29 (diff) | |
| parent | e30d463d450286ffafb442ecc7686df4004c06ff (diff) | |
Merge branch 'jk/reflog-walk-maint' into maint
After "git branch --move" of the currently checked out branch, the
code to walk the reflog of HEAD via "log -g" and friends
incorrectly stopped at the reflog entry that records the renaming
of the branch.
* jk/reflog-walk-maint:
reflog-walk: include all fields when freeing complete_reflogs
reflog-walk: don't free reflogs added to cache
reflog-walk: duplicate strings in complete_reflogs list
reflog-walk: skip over double-null oid due to HEAD rename
Diffstat (limited to 't/t1411-reflog-show.sh')
| -rwxr-xr-x | t/t1411-reflog-show.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t1411-reflog-show.sh b/t/t1411-reflog-show.sh index 6ac7734d79..b9cb76654b 100755 --- a/t/t1411-reflog-show.sh +++ b/t/t1411-reflog-show.sh @@ -171,4 +171,14 @@ test_expect_success 'reflog exists works' ' ! git reflog exists refs/heads/nonexistent ' +# The behavior with two reflogs is buggy and the output is in flux; for now +# we're just checking that the program works at all without segfaulting. +test_expect_success 'showing multiple reflogs works' ' + git log -g HEAD HEAD >actual +' + +test_expect_success 'showing multiple reflogs with an old date' ' + git log -g HEAD@{1979-01-01} HEAD >actual +' + test_done |