From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Stephan Beyer <s-beyer@gmx.net>,
Daniel Barkalow <barkalow@iabervon.org>,
Jakub Narebski <jnareb@gmail.com>
Subject: [PATCH 4/4] rebase -i: use "git sequencer--helper --make-patch"
Date: Fri, 26 Jun 2009 23:08:46 +0200 [thread overview]
Message-ID: <20090626210847.3885.97099.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20090626205319.3885.91532.chriscool@tuxfamily.org>
to simplify the "make_patch" function.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
git-rebase--interactive.sh | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 3be49dd..82f1133 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -146,18 +146,7 @@ load_author_ident () {
}
make_patch () {
- sha1_and_parents="$(git rev-list --parents -1 "$1")"
- case "$sha1_and_parents" in
- ?*' '?*' '?*)
- git diff --cc $sha1_and_parents
- ;;
- ?*' '?*)
- git diff-tree -p "$1^!"
- ;;
- *)
- echo "Root commit"
- ;;
- esac > "$DOTEST"/patch
+ git sequencer--helper --make-patch "$1"
test -f "$DOTEST"/message ||
git cat-file commit "$1" | sed "1,/^$/d" > "$DOTEST"/message
test -f "$SAVE_AUTHOR_INFO" || {
--
1.6.3.GIT
prev parent reply other threads:[~2009-06-26 21:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-26 21:08 [PATCH 0/4] start using sequencer code to port "rebase -i" Christian Couder
2009-06-26 21:08 ` [PATCH 1/4] sequencer: add "builtin-sequencer--helper.c" Christian Couder
2009-06-26 21:08 ` [PATCH 2/4] sequencer: add "make_patch" function to save a patch Christian Couder
2009-06-28 12:13 ` Christian Couder
2009-06-26 21:08 ` [PATCH 3/4] sequencer: free memory used in "make_patch" function Christian Couder
2009-06-26 21:08 ` Christian Couder [this message]
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=20090626210847.3885.97099.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
--cc=s-beyer@gmx.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).