From: Andreas Krey <a.krey@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: [PATCH] commit: make --only --allow-empty work without paths
Date: Tue, 6 Dec 2016 10:39:30 +0100 [thread overview]
Message-ID: <20161206093930.GE16188@inner.h.apk.li> (raw)
In-Reply-To: <xmqqh96i3ygs.fsf@gitster.mtv.corp.google.com>
On Mon, 05 Dec 2016 12:36:19 +0000, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
> > On Sat, Dec 03, 2016 at 07:59:49AM +0100, Andreas Krey wrote:
...
> >> Tool: git commit --allow-empty -m 'FIX: A-123'
> >
> > OK. I think "tool" is slightly funny here, but I get that is part of the
> > real world works. Thanks for illustrating.
>
> I am not sure if I understand. Why isn't the FIX: thing added to
> the commit being pulled by amending it?
Because we don't allow push -f on our blessed repo (bitbucket).
(Oops, answer to wrong question. But the integrators don't want
to meddle with dev's commits, either.)
This has multiple reasons:
- The percentage of people who can and would be willing
to do rebase -i is small. (Not that they are likely to
increase under this policy.)
- Our build tool record builds by commit id, and when
you rebase (even if only for commit message edits)
you lose your (simple) build history.
> Would the convention be for
> the responder of a pull-request to fetch and drop the tip commit?
No, they need to keep it as there is automation hinging on the FIX line.
I would much prefer people to do rebases/amends instead of this crutch,
but that's not for now.
Hmm, it just occurred to me that we might allow force pushes for specific
users to keep the foot-shooting ratio low.
- Andreas
--
"Totally trivial. Famous last words."
From: Linus Torvalds <torvalds@*.org>
Date: Fri, 22 Jan 2010 07:29:21 -0800
next prev parent reply other threads:[~2016-12-06 9:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-02 22:15 [PATCH] commit: make --only --allow-empty work without paths Andreas Krey
2016-12-03 4:32 ` Jeff King
2016-12-03 6:59 ` Andreas Krey
2016-12-03 16:23 ` Jeff King
2016-12-05 20:36 ` Junio C Hamano
2016-12-06 9:39 ` Andreas Krey [this message]
2016-12-05 20:52 ` Junio C Hamano
2016-12-08 13:50 ` [PATCH v2] " Andreas Krey
2016-12-08 16:47 ` Junio C Hamano
2016-12-09 4:10 ` [PATCH] commit: remove 'Clever' message for --only --amend Andreas Krey
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161206093930.GE16188@inner.h.apk.li \
--to=a.krey@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).