[PATCH 7/7] Add an optional limit to git-rebase
From: Yann Dirson <hidden>
Date: 2016-06-15 22:42:16
Subsystem:
the rest · Maintainer:
Linus Torvalds
This patch adds a limit to restrict the list of patches to rebase. This is useful when a set of patches were done against a given head, but needs to be ported to a different head, as opposed to being ported to a descendant of the original head. In such a case we only want to port our own patches, not those that make the two branches different upstream. Signed-off-by: Yann Dirson <redacted> --- git-rebase.sh | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) bf833136c7c4cc17e7e45b959b56cda11528c33a
diff --git a/git-rebase.sh b/git-rebase.sh
index 16d4359..06c7e1a 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh@@ -3,10 +3,10 @@ # Copyright (c) 2005 Junio C Hamano. # -USAGE='<upstream> [<head>]' +USAGE='<upstream> [<head>] [<limit>]' . git-sh-setup -case $# in 1|2) ;; *) usage ;; esac +case $# in 1|2|3) ;; *) usage ;; esac # Make sure we do not have .dotest if mkdir .dotest
@@ -36,6 +36,14 @@ other=$(git-rev-parse --verify "$1^0") | # Make sure the branch to rebase is valid. head=$(git-rev-parse --verify "${2-HEAD}^0") || exit +# Set limit +case "$#" in +3) + limit=$(git-rev-parse --verify "$3^0") || usage ;; +*) + limit= ;; +esac + # If the branch to rebase is given, first switch to it. case "$#" in 2)
@@ -62,5 +70,5 @@ then exit 0 fi -git-format-patch -k --stdout --full-index "$other" ORIG_HEAD | +git-format-patch -k --stdout --full-index "$other" ORIG_HEAD $limit | git am --binary -3 -k
--
1.0.6-g8ecb
--
Yann Dirson <ydirson@altern.org> |
Debian-related: <dirson@debian.org> | Support Debian GNU/Linux:
| Freedom, Power, Stability, Gratis
http://ydirson.free.fr/ | Check <http://www.debian.org/>