> > On Tuesday, February 16, 2016 8:33:54 PM MST Junio C Hamano wrote:
> Wow, that's quite an old discussion ;-)
It wasn't intended to be so
> After these:
> tells me that "--short" still does not notice that there _is_
> something to be committed, either with an ancient version like
> v2.10.5 or
Stephen Smith writes:
> On Tuesday, February 16, 2016 8:33:54 PM MST Junio C Hamano wrote:
Wow, that's quite an old discussion ;-)
>> So if you do this:
>>
>> $ git reset --hard HEAD
>> $ >a-new-file && git add a-new-file
>> $ git commit --dry-run --short; echo $?
>>
>> you'd get
On Tuesday, February 16, 2016 8:33:54 PM MST Junio C Hamano wrote:
> In fact, "commit --dry-run" is already broken without this "a merge
> ends up in a no-op" corner case. The management of s->commitable
> flag and dry_run_commit() that uses it are unfortunately more broken
> than I originally tho
On Tuesday, February 16, 2016 07:33:54 PM Junio C Hamano wrote:
> > ---
>
> I think I mislead you into a slightly wrong direction. While the
> single liner does improve the situation, I think this is merely a
> band-aid upon closer inspection. For example, if you changed your
> "commit --dry-run
On Tuesday, February 16, 2016 07:33:54 PM Junio C Hamano wrote:
> "Stephen P. Smith" writes:
>
> > The 'commit --dry-run' and commit return values differed if a
> > conflicted merge had been resolved and the commit would be the same as
> > the parent.
> >
> > Update show_merge_in_progress to set
"Stephen P. Smith" writes:
> The 'commit --dry-run' and commit return values differed if a
> conflicted merge had been resolved and the commit would be the same as
> the parent.
>
> Update show_merge_in_progress to set the commitable bit if conflicts
> have been resolved and a merge is in progres
On Tuesday, February 16, 2016 04:26:38 PM Stephen & Linda Smith wrote:
> On Tuesday, February 16, 2016 01:54:48 PM Junio C Hamano wrote:
> > "Philip Oakley" writes:
> >
> > >>It appeared that the conditional for 'Reject an attempt to record a
> > >>non-merge empty commit without * explici
On Tuesday, February 16, 2016 08:20:43 AM Philip Oakley wrote:
> From: "Stephen P. Smith"
> > The 'commit --dry-run' and commit return values differed if a
>
> Should this have quotes around the second 'commit' as they both refer to the
> command, rather than the action?
OK
>
> > conflicted me
On Tuesday, February 16, 2016 01:54:48 PM Junio C Hamano wrote:
> "Philip Oakley" writes:
>
> >>It appeared that the conditional for 'Reject an attempt to record a
> >>non-merge empty commit without * explicit --allow-empty.' could be
> >>simplified after adding this patch.
> >>
> >>
"Philip Oakley" writes:
>>It appeared that the conditional for 'Reject an attempt to record a
>>non-merge empty commit without * explicit --allow-empty.' could be
>>simplified after adding this patch.
>>
>>This change can't be propagated to the conditional because it allows
>>
From: "Stephen P. Smith"
The 'commit --dry-run' and commit return values differed if a
Should this have quotes around the second 'commit' as they both refer to the
command, rather than the action?
conflicted merge had been resolved and the commit would be the same as
the parent.
Update sh
The 'commit --dry-run' and commit return values differed if a
conflicted merge had been resolved and the commit would be the same as
the parent.
Update show_merge_in_progress to set the commitable bit if conflicts
have been resolved and a merge is in progress.
Signed-off-by: Stephen P. Smith
---
13 matches
Mail list logo
