Re: [PATCH] am: add --check option

2019-06-04 Thread René Scharfe
Am 03.06.19 um 16:25 schrieb Drew DeVault: > @@ -2195,6 +2206,8 @@ int cmd_am(int argc, const char **argv, const char > *prefix) > 0, PARSE_OPT_NONEG), > OPT_BOOL('c', "scissors", &state.scissors, > N_("strip everything before a scissors li

Re: [PATCH] am: add --check option

2019-06-04 Thread Christian Couder
On Tue, Jun 4, 2019 at 8:03 AM Johannes Sixt wrote: > > Am 04.06.19 um 00:00 schrieb Drew DeVault: > > On Mon Jun 3, 2019 at 11:09 PM Johannes Sixt wrote: > >> I have to wonder how --check works when 'am' applies multiple patches. > >> > >> When the second patch in a patch series depends on that t

Re: [PATCH] am: add --check option

2019-06-04 Thread Johannes Schindelin
Hi, On Tue, 4 Jun 2019, Johannes Sixt wrote: > Am 04.06.19 um 00:00 schrieb Drew DeVault: > > On Mon Jun 3, 2019 at 11:09 PM Johannes Sixt wrote: > >> I have to wonder how --check works when 'am' applies multiple patches. > >> > >> When the second patch in a patch series depends on that the first

Re: [PATCH] am: add --check option

2019-06-03 Thread Johannes Sixt
Am 04.06.19 um 00:00 schrieb Drew DeVault: > On Mon Jun 3, 2019 at 11:09 PM Johannes Sixt wrote: >> I have to wonder how --check works when 'am' applies multiple patches. >> >> When the second patch in a patch series depends on that the first patch >> is fully applied, what does --check do? Without

Re: [PATCH] am: add --check option

2019-06-03 Thread Johannes Sixt
Am 03.06.19 um 16:25 schrieb Drew DeVault: > +--check:: > + Instead of applying the patch(es), see if they are > + applicable to the current working tree and/or the index > + file and detects errors. I have to wonder how --check works when 'am' applies multiple patches. When the secon

Re: [PATCH] am: add --check option

2019-06-03 Thread SZEDER Gábor
On Mon, Jun 03, 2019 at 10:25:23AM -0400, Drew DeVault wrote: > --- > Documentation/git-am.txt | 7 ++- > builtin/am.c | 13 + > 2 files changed, 19 insertions(+), 1 deletion(-) > > diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt > index fc3b993c33..b

[PATCH] am: add --check option

2019-06-03 Thread Drew DeVault
--- Documentation/git-am.txt | 7 ++- builtin/am.c | 13 + 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index fc3b993c33..bc01e87d85 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.t