diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-12-19 10:58:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-12-19 10:58:31 -0800 |
| commit | cb89eebf3bb0b78c5193f8b6293b4b22ce8b08ca (patch) | |
| tree | e40d34e3a7718102cd77b845067acbb76812ad62 /t/t4069-remerge-diff.sh | |
| parent | a1f34d5955035dc64f2e25da0ba2cc0a0c73c21c (diff) | |
| parent | f94bfa151623d7e675db9465ae7ff0b33e4825f3 (diff) | |
| download | git-cb89eebf3bb0b78c5193f8b6293b4b22ce8b08ca.tar.gz | |
Merge branch 'js/log-remerge-keep-ancestry'
"git log -p --remerge-diff --reverse" was completely broken.
* js/log-remerge-keep-ancestry:
log: --remerge-diff needs to keep around commit parents
Diffstat (limited to 't/t4069-remerge-diff.sh')
| -rwxr-xr-x | t/t4069-remerge-diff.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t4069-remerge-diff.sh b/t/t4069-remerge-diff.sh index ca8f999cab..c6c94aef14 100755 --- a/t/t4069-remerge-diff.sh +++ b/t/t4069-remerge-diff.sh @@ -352,4 +352,11 @@ test_expect_success 'remerge-diff turns off history simplification' ' test_cmp expect actual ' +test_expect_success 'remerge-diff with --reverse' ' + git log -1 --remerge-diff --oneline ab_resolution^ >expect && + git log -1 --remerge-diff --oneline ab_resolution >>expect && + git log -2 --remerge-diff --oneline ab_resolution --reverse >actual && + test_cmp expect actual +' + test_done |