This is the mail archive of the
mailing list for the GDB project.
Commit hook annoyance
- From: Eli Zaretskii <eliz at gnu dot org>
- To: Joel Brobecker <brobecker at adacore dot com>
- Cc: gdb-patches at sourceware dot org
- Date: Fri, 16 Jan 2015 18:00:05 +0200
- Subject: Commit hook annoyance
- Authentication-results: sourceware.org; auth=none
- Reply-to: Eli Zaretskii <eliz at gnu dot org>
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: *** 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: *** 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
! [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?