diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-12-16 08:45:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-12-16 08:45:14 -0800 |
| commit | eb8374c652e56ee18702a8d0b06dd6bf6d07eff7 (patch) | |
| tree | e4a32763449d3d575d57d9bf0491353e55e6470e /t/t4069-remerge-diff.sh | |
| parent | The seventh batch (diff) | |
| parent | log: --remerge-diff needs to keep around commit parents (diff) | |
| download | git-eb8374c652e56ee18702a8d0b06dd6bf6d07eff7.tar.gz git-eb8374c652e56ee18702a8d0b06dd6bf6d07eff7.zip | |
Merge branch 'js/log-remerge-keep-ancestry' into js/range-diff-diff-merges
* 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 df342850a0..584ce0fe29 100755 --- a/t/t4069-remerge-diff.sh +++ b/t/t4069-remerge-diff.sh @@ -353,4 +353,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 |