From: Junio C Hamano <junkio@cox.net>
Date: Sun, 08 Jan 2006 09:30:20 GMT
Subject: Re: [PATCH 7/7] Add an optional limit to git-rebase
Message-ID: <7vk6db12z7.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20060108004120.GO1113@nowhere.earth>

Yann Dirson <ydirson@altern.org> writes:

> 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.

This usage makes sense, independent from your git-format-patch
"limit" patch.  The patched argument to git-format-patch does
not match your git-format-patch changes AFAICT ;-).

> -git-format-patch -k --stdout --full-index "$other" ORIG_HEAD |
> +git-format-patch -k --stdout --full-index "$other" ORIG_HEAD $limit |

If all you want to do is to move the cut-off point more recent
than the merge base is, how about (without your git-format-patch
changes) doing something stupid like this instead?

  git-format-patch -k --stdout --full-index ${limit:-"$other"} ORIG_HEAD