[BUG] (git commit --patch --message $MESSAGE) disallows hunk editing

2012-10-22 Thread Max Nanasy
Tested against v1.7.12.4

Steps to reproduce:
A. cd $DIRTY_WORKING_COPY
B. git commit --patch --message $MESSAGE
C. Stage this hunk? e
Expected behavior:
After step C, the hunk opens in the user's editor
Actual behavior:
After step C, the hunk is selected unedited (as if the user had entered 
"y")

AFAICT, this occurs because of the following code in
builtin/commit.c:parse_and_validate_options:
if (... || message.len || ...)
use_editor = 0;
...
if (!use_editor)
setenv("GIT_EDITOR", ":", 1);
Because --message is specified, GIT_EDITOR is set to ":", which
prevents the user from editing hunks, although the intent is most
likely to just prevent the user from editing the commit message.
--
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: [BUG] (git commit --patch --message $MESSAGE) disallows hunk editing

2014-02-27 Thread Pierre-Olivier Vares
Max Nanasy  gmail.com> writes:

> Tested against v1.7.12.4

Confirmed in 1.8.5.2

--
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: [BUG] (git commit --patch --message $MESSAGE) disallows hunk editing

2014-09-29 Thread Max Nanasy
Max Nanasy  gmail.com> writes:

> 
> Tested against v1.7.12.4
> 
> Steps to reproduce:
>   A. cd $DIRTY_WORKING_COPY
>   B. git commit --patch --message $MESSAGE
>   C. Stage this hunk? e
> Expected behavior:
>   After step C, the hunk opens in the user's editor
> Actual behavior:
>   After step C, the hunk is selected unedited (as if the user had entered 
> "y")
> 
> AFAICT, this occurs because of the following code in
> builtin/commit.c:parse_and_validate_options:
>   if (... || message.len || ...)
>   use_editor = 0;
>   ...
>   if (!use_editor)
>   setenv("GIT_EDITOR", ":", 1);
> Because --message is specified, GIT_EDITOR is set to ":", which
> prevents the user from editing hunks, although the intent is most
> likely to just prevent the user from editing the commit message.
> 

It appears that this was fixed in version 2.0.  The changelog entry says:

 * When it is not necessary to edit a commit log message (e.g. "git
   commit -m" is given a message without specifying "-e"), we used to
   disable the spawning of the editor by overriding GIT_EDITOR, but
   this means all the uses of the editor, other than to edit the
   commit log message, are also affected.
   (merge b549be0 bp/commit-p-editor later to maint).

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