From: Eli Zaretskii <eliz@gnu.org>
To: Joel Brobecker <brobecker@adacore.com>
Cc: gdb-patches@sourceware.org
Subject: Commit hook annoyance
Date: Fri, 16 Jan 2015 15:59:00 -0000 [thread overview]
Message-ID: <83ppae1zsq.fsf@gnu.org> (raw)
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?
next reply other threads:[~2015-01-16 15:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-16 15:59 Eli Zaretskii [this message]
2015-01-16 16:10 ` H.J. Lu
2015-01-16 16:38 ` Eli Zaretskii
2015-01-16 16:18 ` Joel Brobecker
2015-01-16 16:26 ` Joel Brobecker
2015-01-16 16:42 ` Eli Zaretskii
2015-01-16 17:45 ` Doug Evans
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83ppae1zsq.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=brobecker@adacore.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox