Re: [RFC] Disabling status hints in COMMIT_EDITMSG

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Sep 10, 2013, 11:04 UTC
Message-ID: <vpqtxhtey4t.fsf@anie.imag.fr>
In-Reply-To: <522EEC28.6020405@gmail.com>

Chris Packham <judge.packham@gmail.com> writes:

Show 13 quoted lines

> On 10/09/13 21:19, Matthieu Moy wrote:
>> Hi,
>> 
>> I just noticed that the template COMMIT_EDITMSG was containing status
>> hints, and that they were not particularty helpfull _during_ a commit. I
>> think it would be sensible to ignore advice.statusHints and disable
>> hints unconditionally when writting to COMMIT_EDITMSG.
>> 
>> Any objection?
>> 
>
> I did recently find them useful/reassuring when I was committing a
> merge. But I wouldn't consider that a strong objection.

Just to make sure we're talking about the same thing: when commiting a merge, the template currently looks like:

  Merge branch 'master' of /tmp/git
  
  Conflicts:
  	foo.txt
  #
  # It looks like you may be committing a merge.
  # If this is not correct, please remove the file
  #	.git/MERGE_HEAD
  # and try again.
  
  
  # Please enter the commit message for your changes. Lines starting
  # with '#' will be ignored, and an empty message aborts the commit.
  # On branch master
  # Your branch and 'origin/master' have diverged,
  # and have 3 and 1 different commit each, respectively.
  #   (use "git pull" to merge the remote branch into yours)
  #
  # All conflicts fixed but you are still merging.
  #   (use "git commit" to conclude merge)
  #
  # Changes to be committed:
  #
  #	modified:   foo.txt
  #

What I'd like to remove are the parts between parenthesis :

  (use "git commit" to conclude merge)
  (use "git pull" to merge the remote branch into yours)

The first part (It looks like [...]) would remain, of course.

Actually, even the "All conflicts fixed but you are still merging." part is not really accurate when the commit is already started.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/