X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=git-filter-branch.sh;h=962a93b586571eb6fc60aae53c77f6e6b9fb281f;hb=6be0559183ac0b40680df314748141d1bdf28e41;hp=88fb0f070e5f32c62ae47f90f1f27ffeef836d8f;hpb=7e00a9104bc8ce27f73132fbaa8f8528e26206a8;p=thirdparty%2Fgit.git

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 88fb0f070e..962a93b586 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -139,6 +139,7 @@ do
 		continue
 		;;
 	--remap-to-ancestor)
+		# deprecated ($remap_to_ancestor is set now automatically)
 		shift
 		remap_to_ancestor=t
 		continue
@@ -265,7 +266,14 @@ mkdir ../map || die "Could not create map/ directory"
 
 # we need "--" only if there are no path arguments in $@
 nonrevs=$(git rev-parse --no-revs "$@") || exit
-test -z "$nonrevs" && dashdash=-- || dashdash=
+if test -z "$nonrevs"
+then
+	dashdash=--
+else
+	dashdash=
+	remap_to_ancestor=t
+fi
+
 rev_args=$(git rev-parse --revs-only "$@")
 
 case "$filter_subdir" in