From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org
Subject: [PATCH 3/3] git-rebase-script: rebase local commits to new upstream head.
Date: Thu, 23 Jun 2005 16:29:09 -0700 [thread overview]
Message-ID: <7v4qboejp6.fsf_-_@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <7v4qbofym7.fsf_-_@assigned-by-dhcp.cox.net> (Junio C. Hamano's message of "Thu, 23 Jun 2005 16:21:36 -0700")
Using git-cherry, forward port local commits missing from the
new upstream head. This depends on "-m" flag support in
git-commit-script.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
Makefile | 2 +-
git-rebase-script | 46 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 1 deletions(-)
create mode 100755 git-rebase-script
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ SCRIPTS=git git-apply-patch-script git-m
git-deltafy-script git-fetch-script git-status-script git-commit-script \
git-log-script git-shortlog git-cvsimport-script git-diff-script \
git-reset-script git-add-script git-checkout-script git-clone-script \
- gitk git-cherry
+ gitk git-cherry git-rebase-script
PROG= git-update-cache git-diff-files git-init-db git-write-tree \
git-read-tree git-commit-tree git-cat-file git-fsck-cache \
diff --git a/git-rebase-script b/git-rebase-script
new file mode 100755
--- /dev/null
+++ b/git-rebase-script
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# Copyright (c) 2005 Junio C Hamano.
+#
+
+usage="usage: $0 "'<upstream> [<head>]
+
+Uses output from git-cherry to rebase local commits to the new head of
+upstream tree.'
+
+: ${GIT_DIR=.git}
+
+case "$#" in
+1) linus=`git-rev-parse "$1"` &&
+ junio=`git-rev-parse HEAD` || exit
+ ;;
+2) linus=`git-rev-parse "$1"` &&
+ junio=`git-rev-parse "$2"` || exit
+ ;;
+*) echo >&2 "$usage"; exit 1 ;;
+esac
+
+git-read-tree -m -u $junio $linus &&
+echo "$linus" >"$GIT_DIR/HEAD" || exit
+
+tmp=.rebase-tmp$$
+fail=$tmp-fail
+trap "rm -rf $tmp-*" 0 1 2 3 15
+
+>$fail
+
+git-cherry $linus $junio |
+while read commit
+do
+ S=`cat "$GIT_DIR/HEAD"` &&
+ GIT_EXTERNAL_DIFF=git-apply-patch-script git-diff-tree -p $commit &&
+ git-commit-script -m "$commit" || {
+ echo $commit >>$fail
+ git-read-tree --reset -u $S
+ }
+done
+if test -s $fail
+then
+ echo Some commits could not be rebased, check by hand:
+ cat $fail
+fi
------------
next prev parent reply other threads:[~2005-06-23 23:22 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-20 16:19 Patch (apply) vs. Pull Darrin Thompson
2005-06-20 17:22 ` Junio C Hamano
2005-06-20 23:01 ` Darrin Thompson
2005-06-21 18:02 ` Daniel Barkalow
2005-06-22 8:47 ` Junio C Hamano
2005-06-22 9:56 ` Catalin Marinas
2005-06-21 22:09 ` Linus Torvalds
2005-06-22 9:08 ` Junio C Hamano
2005-06-22 17:21 ` Linus Torvalds
2005-06-22 20:08 ` Daniel Barkalow
2005-06-22 20:22 ` Linus Torvalds
2005-06-22 21:54 ` Daniel Barkalow
2005-06-22 22:21 ` Linus Torvalds
2005-06-23 3:32 ` Daniel Barkalow
2005-06-23 4:23 ` Linus Torvalds
2005-06-23 5:15 ` Daniel Barkalow
2005-06-23 6:09 ` Linus Torvalds
2005-06-23 16:45 ` Daniel Barkalow
2005-06-23 18:43 ` Linus Torvalds
2005-06-23 19:59 ` Daniel Barkalow
2005-06-23 22:20 ` Linus Torvalds
2005-06-23 22:49 ` Linus Torvalds
2005-06-23 12:10 ` Catalin Marinas
2005-06-23 17:05 ` Daniel Barkalow
2005-06-24 13:41 ` Catalin Marinas
2005-06-23 8:47 ` Martin Langhoff
2005-06-22 16:23 ` Darrin Thompson
2005-06-23 8:36 ` Martin Langhoff
2005-06-23 23:21 ` [PATCH 0/3] Rebasing for "individual developer" usage Junio C Hamano
2005-06-23 23:27 ` [PATCH 1/3] git-commit-script: get commit message from an existing one Junio C Hamano
2005-06-23 23:28 ` [PATCH 2/3] git-cherry: find commits not merged upstream Junio C Hamano
2005-06-23 23:29 ` Junio C Hamano [this message]
2005-06-22 17:04 ` Patch (apply) vs. Pull Catalin Marinas
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=7v4qboejp6.fsf_-_@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.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.
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).