Hi Duy, On Tue, 14 May 2019, Nguyễn Thái Ngọc Duy wrote:
> 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 && This makes me really worried. It is the same `master` (i.e. *not* a tag) that broke this test case in the previous round. > + 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 && Isn't this a clear implementation details of `git rerere` that you just taught `git merge`'s regression test? That's *prone* to become a test failure without a bug. It would probably make a ton more sense to look at the output of `git rerere status` instead. Ciao, Johannes > + 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 > +' > + > test_done > -- > 2.21.0.1141.gd54ac2cb17 > >
