Lars Hjemli <hjemli@xxxxxxxxx> writes: > This test-script tries to excercise the porcelainish aspects of git-merge. It does exercise; no need for "tries to" ;-). > +test_expect_success 'verify merge result' ' > + echo " > +1 X > +2 > +3 > +4 > +5 > +6 > +7 > +8 > +9 > +" > result.1 && > + cmp -s file result.1 > +' Unless there is a compelling reason otherwise, I'd prefer tests with a test vector like this to be spelled like this: diff -u result.1 file That is, compare to show the difference actual output might have from the expected result. It's easier to spot the difference when you later break things this way. > +test_expect_success 'merge c1 with c2' ' > + git reset --hard c1 && > + git merge c2 && > + test "$c1" = "$(git rev-parse HEAD^1)" && > + test "$c2" = "$(git rev-parse HEAD^2)" > +' We might also want to test: - the index is merged; - the working tree matches the index; - the merge message (e.g. "git show -s --pretty=format:%s HEAD") is as expected; Otherwise I think it is a good idea to add these tests. By the way, I think squash_message() leaves a wrong message template for an Octopus, which might be worth fixing. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
