Re: [RFC/PATCH] status: introduce status.displayCommentChar to disable display of #

2013-08-28 Thread Matthieu Moy
Johannes Sixt  writes:

> How does your solution work when dirty submodules are involved and
> submodule status is included?f

Badly ;-).

I didn't notice the subcommand call for submodules summary. It's a bit
more tricky to get right, as the "git sumbodule summary --for-status"
call did not know whether it was called from commit or from status.

I fixed this by adding a --[no-]-display-comment-char to git submodule
summary.

>> +test_expect_success 'status with status.displayCommentChar=false' '
>> +"$PERL_PATH" -pi -e "s/^\# //; s/^\#$//; s/^#\t/\t/" expect &&
>
> Perl's -i does not work on Windows when no backup file extension is given.
> Therefore, please use a temporary file or "... -pi.bak ..."

OK I didn't know that. I went the old good sed+mv way.

New series comming.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [RFC/PATCH] status: introduce status.displayCommentChar to disable display of #

2013-08-28 Thread Johannes Sixt
Am 8/28/2013 10:32, schrieb Matthieu Moy:
> Historically, "git status" needed to prefix each output line with '#' so
> that the output could be added as comment to the commit message. This
> prefix comment has no real purpose when "git status" is ran from the
> command-line, and this may distract users from the real content.
> 
> Allow the user to disable this prefix comment. In the long run, if users
> like the non-prefix output, it may make sense to flip the default value
> to true.
> 
> Obviously, status.displayCommentChar applies to "git status" but is
> ignored by "git commit", so the status is still commented in
> COMMIT_EDITMSG.
> 
> Signed-off-by: Matthieu Moy 
> ---
> As a beginner (long ago), I found this comment-prefixed output really
> weird. I got used to it,...

You have my sympathy.

How does your solution work when dirty submodules are involved and
submodule status is included?

> +test_expect_success 'status with status.displayCommentChar=false' '
> + "$PERL_PATH" -pi -e "s/^\# //; s/^\#$//; s/^#\t/\t/" expect &&

Perl's -i does not work on Windows when no backup file extension is given.
Therefore, please use a temporary file or "... -pi.bak ..."

> + git -c status.displayCommentChar=false status >output &&
> + test_i18ncmp expect output
> +'

-- Hannes
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html