From: tytso@mit.edu
To: Jay Soffian <jaysoffian@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Eric Wong <normalperson@yhbt.net>,
git@vger.kernel.org
Subject: Re: [RFC/PATCH] rebase: add -x option to record original commit name
Date: Sat, 6 Feb 2010 08:32:27 -0500 [thread overview]
Message-ID: <20100206133227.GE321@thunk.org> (raw)
In-Reply-To: <76718491002052119j5d6bae35s146bed8da03e3983@mail.gmail.com>
On Sat, Feb 06, 2010 at 12:19:02AM -0500, Jay Soffian wrote:
> On Fri, Feb 5, 2010 at 11:43 PM, Junio C Hamano <gitster@pobox.com> wrote:
> > How could that be a counterproposal to a deprecation of -x and adding
> > hooks as a replacement, as a solution to more general issues?
>
> Sorry, it's been a long week and I wasn't thinking clearly.
>
> Yes, adding post-cherry/rebase hook(s) would keep all parties happy. :-)
I really don't think it's a contamination of the log when it's used to
record a cherry pick of patch from the dev stream to an older
maintainance branch, but I'll grudgingly accept doing via a hook; but
can there be an easy way to control whether or not the hook is
actually executed?
*Normally* I don't want cherry-pick -x, but some of the time I do want
it, and manually enabling and disabling the hook by having to do some
kind of "chmod -x .git/hooks/cherry-pick" command. I suppose I could
create an alias for cherry-pick-record which does a "chmod a+x `git
rev-parse --git-dir`/hooks/cherry-pick; git cherry-pick $*; chmod a-x
`git rev-parse --git-dir`/hooks/cherry-pick", but that seems really
hacky. :-(
So it would be nice if there was some kind of command-line option to
cherry-pick which could be passed to the hook script.
- Ted
next prev parent reply other threads:[~2010-02-06 13:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-06 1:19 [RFC/PATCH] rebase: add -x option to record original commit name Jay Soffian
2010-02-06 1:35 ` Junio C Hamano
2010-02-06 1:58 ` Jay Soffian
2010-02-06 2:00 ` Jay Soffian
2010-02-06 2:57 ` Junio C Hamano
2010-02-06 4:18 ` Jay Soffian
2010-02-06 4:43 ` Junio C Hamano
2010-02-06 5:19 ` Jay Soffian
2010-02-06 13:32 ` tytso [this message]
2010-02-06 17:47 ` Junio C Hamano
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=20100206133227.GE321@thunk.org \
--to=tytso@mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jaysoffian@gmail.com \
--cc=normalperson@yhbt.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.
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 NNTP newsgroup(s).