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

Re: [PATCH-v3] Allow git-filter-branch to process large repositories with lots of branches.

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 10, 2013, 23:20 UTC
Message-ID
<xmqqli34uuvy.fsf@gitster.dls.corp.google.com>
In-Reply-To
<CE54F01A.19632%lee.carver@corp.service-now.com>
Lee Carver <Lee.Carver@servicenow.com> writes:
Show 33 quoted lines
> As noted in several forums, a recommended way to move trees between
> repositories
> is to use git-filter-branch to revise the history for a single tree:
>
> http://gbayer.com/development/moving-files-from-one-git-repository-to-anoth
> er-preserving-history/
> http://stackoverflow.com/questions/1365541/how-to-move-files-from-one-git-r
> epo-to-another-not-a-clone-preserving-history
>
> However, this can lead to argument list too long errors when the original
> repository has many retained branches (>6k)
>
> /usr/local/git/libexec/git-core/git-filter-branch: line 270:
> /usr/local/git/libexec/git-core/git: Argument list too long
> Could not get the commits
>
> Piping the saved output from git rev-parse into git rev-list avoids this
> problem, since the rev-parse output is not processed as a command line
> argument.
> ---
>  git-filter-branch.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/git-filter-branch.sh b/git-filter-branch.sh
> index ac2a005..2091885 100755
> --- a/git-filter-branch.shgit
> +++ b/git-filter-branch.sh
> @@ -255,7 +255,7 @@ else
>  	remap_to_ancestor=t
>  fi
>  
> -rev_args=$(git rev-parse --revs-only "$@")
> +git rev-parse --revs-only "$@" > ../parse

Where is this "rev-parse" command running? Is it always safe to clobber the file "../parse" like this?

Show 11 quoted lines
>  
>  case "$filter_subdir" in
>  "")
> @@ -268,7 +268,7 @@ case "$filter_subdir" in
>  esac
>  
>  git rev-list --reverse --topo-order --default HEAD \
> -	--parents --simplify-merges $rev_args "$@" > ../revs ||
> +	--parents --simplify-merges --stdin "$@" < ../parse > ../revs ||
>  	die "Could not get the commits"
>  commits=$(wc -l <../revs | tr -d " ")
Previous: Lee CarverNext: Lee Carver
Message 4 of 7 in “Allow git-filter-branch to process large repositories with lots of branches.”
  1. Allow git-filter-branch to process large repositories with lots of branches.Lee Carver, Sep 7, 2013
  2. Stefano LattariniSep 7, 2013
  3. Allow git-filter-branch to process large repositories with lots of branches.Lee Carver, Sep 10, 2013
  4. Junio C HamanoSep 10, 2013
  5. Lee CarverSep 11, 2013
  6. Junio C HamanoSep 11, 2013
  7. Allow git-filter-branch to process large repositories with lots of branches.Lee Carver, Sep 12, 2013

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.