Re: Commit hook annoyance

[Joel Brobecker <brobecker@adacore.com>]

> Is this really necessary?
> 
>   $ git push
>   Counting objects: 94, done.
>   Compressing objects: 100% (4/4), done.
>   Writing objects: 100% (4/4), 742 bytes | 0 bytes/s, done.
>   Total 4 (delta 3), reused 0 (delta 0)
>   remote: *** Pattern "Conflicts:" has been detected.
>   remote: *** (in commit 7fa8e2a29c9357024d21bdf09faa5cb930a4ffe5)
>   remote: ***
>   remote: *** This usually indicates a merge commit where some merge conflicts
>   remote: *** had to be resolved, but where the "Conflicts:" section has not
>   remote: *** been deleted from the revision history.
>   remote: ***
>   remote: *** Please edit the commit's revision history to either delete
>   remote: *** the section, or to avoid using the pattern above by itself.
>   remote: error: hook declined to update refs/heads/gdb-7.9-branch
>   To git+ssh://sourceware.org/git/binutils-gdb.git
>    ! [remote rejected] gdb-7.9-branch -> gdb-7.9-branch (hook declined)
>   error: failed to push some refs to 'git+ssh://sourceware.org/git/binutils-gdb.git'
> 
> There  was no unresolved conflicts in the commit I tried to push.  Why
> does the hook insist on forcing me to remove the "Conflicts:" part,
> instead of looking for the merge-commit conflict markers?  Why do we
> care about leaving the reference to original conflicts in the log?

There is a commit whose revision log has a line that has "Conflict:"
in its revision log. This usually happens when you cherry-pick
a commit, resolve merge conflicts, and then commit again. Git
decides to append a section at the end off the new revision log
which lists the files where there were some conflicts.

In our experience at AdaCore, these are useless, and people often
don't even notice them. Hence the check.

-- 
Joel