Re: [PATCH] wt-status.c: set commitable bit if there is a meaningful merge.

From: Stephen Smith <ischis2@cox.net>
Date: Aug 22, 2018, 05:33 UTC
Message-ID: <28440975.G22uFktzHy@thunderbird>
In-Reply-To: <1455590305-30923-1-git-send-email-ischis2@cox.net>

On Tuesday, February 16, 2016 8:33:54 PM MST Junio C Hamano wrote:

Show 5 quoted lines

> 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 thought.
>

<snip>

Show 12 quoted lines

> This function is only called from wt_status_print(), which in turn
> is only called from run_status() in commit.c when the status format
> is unspecified or set to STATUS_FORMAT_LONG.
> 
> 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 "No, there is nothing interesting to commit", which is
> clearly bogus.

I was about to start working on working on this and ran the test you suggested back in 2016. I don't get the error message from that time period. I believe that this was fixed.