Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> writes: > diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh > index 106148254d..d453710ef6 100755 > --- a/t/t7600-merge.sh > +++ b/t/t7600-merge.sh > @@ -822,4 +822,18 @@ test_expect_success EXECKEEPSPID 'killed merge can be completed with --continue' > verify_parents $c0 $c1 > ' > > +test_expect_success 'merge --quit' ' > + git reset --hard c2 && > + test_must_fail git -c rerere.enabled=true merge master && > + test_path_is_file .git/MERGE_HEAD && > + test_path_is_file .git/MERGE_MODE && > + test_path_is_file .git/MERGE_MSG && > + test_path_is_file .git/MERGE_RR && > + git merge --quit && > + test_path_is_missing .git/MERGE_HEAD && > + test_path_is_missing .git/MERGE_MODE && > + test_path_is_missing .git/MERGE_MSG && > + test_path_is_missing .git/MERGE_RR > +' I'd appreciate to see test_when_finished used in this test so that later tests, possibly added by another topic in parallel, would start in a more-or-less reasonable state.
