From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: [PATCH 3/3] git-rebase-script: rebase local commits to new upstream head. Date: Thu, 23 Jun 2005 16:29:09 -0700 Message-ID: <7v4qboejp6.fsf_-_@assigned-by-dhcp.cox.net> References: <1119284365.3926.15.camel@localhost.localdomain> <7vbr61j631.fsf@assigned-by-dhcp.cox.net> <7v4qbofym7.fsf_-_@assigned-by-dhcp.cox.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Jun 24 01:23:07 2005 Return-path: Received: from vger.kernel.org ([12.107.209.244]) by ciao.gmane.org with esmtp (Exim 4.43) id 1Dlb2B-0004MO-JP for gcvg-git@gmane.org; Fri, 24 Jun 2005 01:22:59 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262820AbVFWX3V (ORCPT ); Thu, 23 Jun 2005 19:29:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262830AbVFWX3V (ORCPT ); Thu, 23 Jun 2005 19:29:21 -0400 Received: from fed1rmmtao06.cox.net ([68.230.241.33]:5623 "EHLO fed1rmmtao06.cox.net") by vger.kernel.org with ESMTP id S262820AbVFWX3L (ORCPT ); Thu, 23 Jun 2005 19:29:11 -0400 Received: from assigned-by-dhcp.cox.net ([68.4.60.172]) by fed1rmmtao06.cox.net (InterMail vM.6.01.04.00 201-2131-118-20041027) with ESMTP id <20050623232909.JSLW19494.fed1rmmtao06.cox.net@assigned-by-dhcp.cox.net>; Thu, 23 Jun 2005 19:29:09 -0400 To: Linus Torvalds In-Reply-To: <7v4qbofym7.fsf_-_@assigned-by-dhcp.cox.net> (Junio C. Hamano's message of "Thu, 23 Jun 2005 16:21:36 -0700") User-Agent: Gnus/5.1007 (Gnus v5.10.7) Emacs/21.4 (gnu/linux) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org 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 --- 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 "' [] + +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 ------------