Re: [PATCH v3 1/3] t7501: add merge conflict tests for dry run

2018-07-17 Thread Junio C Hamano
Junio C Hamano writes: > But by splitting these into separate tests, the patch makes such a > potential failure with "git commit --short" break the later steps. > > Not very nice. > > It may be a better change to just do in the original one > > git add test-file && > git commit

Re: [PATCH v3 1/3] t7501: add merge conflict tests for dry run

2018-07-17 Thread Junio C Hamano
Samuel Lijin writes: > The behavior of git commit when doing a dry run changes if there are > unfixed/fixed merge conflits, but the test suite currently only asserts > that `git commit --dry-run` succeeds when all merge conflicts are fixed. > > Add tests to document the behavior of all flags

[PATCH v3 1/3] t7501: add merge conflict tests for dry run

2018-07-15 Thread Samuel Lijin
The behavior of git commit when doing a dry run changes if there are unfixed/fixed merge conflits, but the test suite currently only asserts that `git commit --dry-run` succeeds when all merge conflicts are fixed. Add tests to document the behavior of all flags which imply a dry run when (1)