X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-filter-branch.sh;h=195b5ef48ed3371b2010f9caf711e12089da9c06;hb=85e2233f982f760d0e731b1258da2580834d8027;hp=6b8b6a4f26a60c325a2c76e1d5b0e747b9d1d99b;hpb=f2f3a6b802e3dae09a1c414cd8516ff2a546a527;p=git.git diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 6b8b6a4f2..195b5ef48 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -259,7 +259,6 @@ test -s "$tempdir"/heads || GIT_INDEX_FILE="$(pwd)/../index" export GIT_INDEX_FILE -git read-tree || die "Could not seed the index" # map old->new commit ids for rewriting parents mkdir ../map || die "Could not create map/ directory" @@ -473,7 +472,7 @@ if [ "$filter_tag_name" ]; then git mktag) || die "Could not create new tag object for $ref" if git cat-file tag "$ref" | \ - grep '^-----BEGIN PGP SIGNATURE-----' >/dev/null 2>&1 + sane_grep '^-----BEGIN PGP SIGNATURE-----' >/dev/null 2>&1 then warn "gpg signature stripped from tag object $sha1t" fi