Re: [PATCH 2/3] Add test for commit --dry-run --short.
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Aug 31, 2018, 07:18 UTC
- Message-ID
- <87bm9jc8cq.fsf@evledraar.gmail.com>
- In-Reply-To
- <20180831053921.8083-3-ischis2@cox.net>
On Fri, Aug 31 2018, Stephen P. Smith wrote:
Show 30 quoted lines
> Add test for commit with --dry-run --short for a new file of zero > length. > > The test demonstrated that the setting of the commitable flag was > broken as was found durning an earlier patch review. > > Signed-off-by: Stephen P. Smith <ischis2@cox.net> > --- > t/t7501-commit.sh | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh > index 810d4cea7..fc69da816 100755 > --- a/t/t7501-commit.sh > +++ b/t/t7501-commit.sh > @@ -682,4 +682,14 @@ test_expect_success '--dry-run with conflicts fixed from a merge' ' > git commit -m "conflicts fixed from merge." > ' > > +test_expect_success '--dry-run --short with conflicts fixed from a merge' ' > + # setup two branches with conflicting information > + # in the same file, resolve the conflict, > + # call commit with --dry-run --short > + rm -f test-file && > + touch testfile && > + git add test-file && > + git commit --dry-run --short > +' > + > test_done
Ditto my comment on 1/3 on this. I.e. this changes the failing tests in this series from 2 to 3.