git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 7/7] Add an optional limit to git-rebase

From
Junio C Hamano <junkio@cox.net>
Date
Jan 8, 2006, 09:30 UTC
Message-ID
<7vk6db12z7.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20060108004120.GO1113@nowhere.earth>
Yann Dirson <ydirson@altern.org> writes:
Show 7 quoted lines
> 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
Previous: Yann DirsonNext: Yann Dirson
Message 4 of 5 in “Add an optional limit to git-rebase”
  1. 7/7 Add an optional limit to git-rebaseYann Dirson, Jan 8, 2006
  2. Junio C HamanoJan 8, 2006
  3. Yann DirsonJan 8, 2006
  4. Junio C HamanoJan 8, 2006
  5. Yann DirsonJan 8, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.