Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Joel Brobecker <brobecker@adacore.com>
Cc: gdb-patches@sourceware.org
Subject: Re: Commit hook annoyance
Date: Fri, 16 Jan 2015 16:42:00 -0000	[thread overview]
Message-ID: <83k30m1xvh.fsf@gnu.org> (raw)
In-Reply-To: <20150116161841.GS8167@adacore.com>

> Date: Fri, 16 Jan 2015 20:18:41 +0400
> From: Joel Brobecker <brobecker@adacore.com>
> Cc: gdb-patches@sourceware.org
> 
> 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.

Yes, that's what happened.  Quite normal.

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

Being useless doesn't mean harmful.  (I do notice that part, but I'm
used to leaving it there.)  Rejecting a push is an annoyance I'd
rather do without.  Moreover, that line is a record of the fact that
there was a conflict, which might be useful one day.

So how about removing that particular reason for rejecting a push?

Thanks.


  parent reply	other threads:[~2015-01-16 16:42 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-16 15:59 Eli Zaretskii
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 [this message]
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=83k30m1xvh.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