summaryrefslogtreecommitdiff
path: root/git-filter-branch.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-10-17 22:55:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-10-17 22:55:12 (GMT)
commitf52752d36a98d0e5a70242d615d0f36f84936b45 (patch)
tree93d0e67a6e082dbc6fa5884cba5683b58258211b /git-filter-branch.sh
parentff6e1b887f6f038b7e8d7aaea2ca19d9add03607 (diff)
parent3361a548dbedde96d75bd4134e9ab9e6d82774dd (diff)
downloadgit-f52752d36a98d0e5a70242d615d0f36f84936b45.zip
git-f52752d36a98d0e5a70242d615d0f36f84936b45.tar.gz
git-f52752d36a98d0e5a70242d615d0f36f84936b45.tar.bz2
Merge branch 'lc/filter-branch-too-many-refs'
"git filter-branch" in a repository with many refs blew limit of command line length. * lc/filter-branch-too-many-refs: Allow git-filter-branch to process large repositories with lots of branches.
Diffstat (limited to 'git-filter-branch.sh')
-rwxr-xr-xgit-filter-branch.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 98e8fe4..86d6994 100755
--- a/git-filter-branch.sh
+++ 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
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 " ")