diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-08 09:59:33 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 09:59:33 +0300 |
| commit | ad3207e6ff019060e4f634a5455aa0ae248e3a7a (patch) | |
| tree | 8a5d3a7ffb087a491ecb6d4db68078144e4df495 /t/t9350-fast-export.sh | |
| parent | df7abe3fef01d7fa45114e4eb6cabf06f688b260 (diff) | |
| parent | be011bbe001facf71bd636494eb253aa5151d26a (diff) | |
Merge branch 'ma/fast-export-skip-merge-fix'
"git fast-export" had a regression in v2.15.0 era where it skipped
some merge commits in certain cases, which has been corrected.
* ma/fast-export-skip-merge-fix:
fast-export: fix regression skipping some merge-commits
Diffstat (limited to 't/t9350-fast-export.sh')
| -rwxr-xr-x | t/t9350-fast-export.sh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh index d5679ffb87..6a392e87bc 100755 --- a/t/t9350-fast-export.sh +++ b/t/t9350-fast-export.sh @@ -538,4 +538,22 @@ test_expect_success 'when using -C, do not declare copy when source of copy is a test_cmp expected actual ' +test_expect_success 'merge commit gets exported with --import-marks' ' + test_create_repo merging && + ( + cd merging && + test_commit initial && + git checkout -b topic && + test_commit on-topic && + git checkout master && + test_commit on-master && + test_tick && + git merge --no-ff -m Yeah topic && + + echo ":1 $(git rev-parse HEAD^^)" >marks && + git fast-export --import-marks=marks master >out && + grep Yeah out + ) +' + test_done |