git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Chris Packham" <judge.packham@gmail.com>
To: git@vger.kernel.org
Subject: Removing a commit from a local branch
Date: Mon, 12 Jan 2009 11:42:24 +1300	[thread overview]
Message-ID: <a038bef50901111442y16695664y4fed7cdd9d8af27@mail.gmail.com> (raw)
In-Reply-To: <a038bef50901111441w21959397tc41922656a25027c@mail.gmail.com>

Hi List,

I'm part of a development team using git. We use a maintainer model
where developers send patches/pull requests to a maintainer who
applies the patches to a local branch, decides if they're good or not
and pushes the good patches to the public repository.

What I want to do is script the removal of a bad patch so that the
maintainer identifies a patch in his local branch, sends an email to
the author telling them why their patch is being rejected then removes
the commit for that patch. Using git log a script can extract the
author email address, hash and headline of each commit. Based on that
information scripting the email is easy enough. Now I come to using
git rebase to remove the bad commit based on its hash which leads me
to my question - How do I refer to a commit based on the hash of its
parent?

Consider the following example. The maintainer has the following branch locally

  todeliver: A-B-C-D

He is happy with commits A, C and D but wants to reject B. Ideally I
want to be able to say
  git rebase --onto <parent of B> <child of B> todelvier

and get
  todeliver: A-C'-D'

I know that <parent of B> can be referred to as B~1 but what about
<child of B>? I've read through the man page for git-rev-parse and
nothing stands out as child of commit X.

Is there a better what do achieve what I'm after?

Thanks,
Chris

       reply	other threads:[~2009-01-11 22:44 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <a038bef50901111441w21959397tc41922656a25027c@mail.gmail.com>
2009-01-11 22:42 ` Chris Packham [this message]
2009-01-11 22:48   ` Removing a commit from a local branch Jakub Narebski
2009-01-11 22:52   ` Björn Steinbrink
2009-01-12  0:12     ` Chris Packham
2009-01-12  1:20   ` Sitaram Chamarty

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=a038bef50901111442y16695664y4fed7cdd9d8af27@mail.gmail.com \
    --to=judge.packham@gmail.com \
    --cc=git@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).