summaryrefslogtreecommitdiff
path: root/t/t7003-filter-branch.sh
diff options
context:
space:
mode:
authorLars Noschinski <lars@public.noschinski.de>2009-02-18 08:35:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-18 19:15:17 (GMT)
commit88e38808cd52aaed327a82d6a6ffdb8b9da621f2 (patch)
treed8516c8207b752d58acf43cfe646a6bdb1a1b025 /t/t7003-filter-branch.sh
parent51b2ead03c8cdc0ddeeca2fb5db14b7bac584337 (diff)
downloadgit-88e38808cd52aaed327a82d6a6ffdb8b9da621f2.zip
git-88e38808cd52aaed327a82d6a6ffdb8b9da621f2.tar.gz
git-88e38808cd52aaed327a82d6a6ffdb8b9da621f2.tar.bz2
filter-branch -d: Export GIT_DIR earlier
The improved error handling catches a bug in filter-branch when using -d pointing to a path outside any git repository: $ git filter-branch -d /tmp/foo master fatal: Not a git repository (or any of the parent directories): .git This error message comes from git for-each-ref in line 224. GIT_DIR is set correctly by git-sh-setup (to the foo.git repository), but not exported (yet). Signed-off-by: Lars Noschinski <lars@public.noschinski.de> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7003-filter-branch.sh')
-rwxr-xr-xt/t7003-filter-branch.sh12
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index 56b5ecc..329c851 100755
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh
@@ -48,6 +48,18 @@ test_expect_success 'result is really identical' '
test $H = $(git rev-parse HEAD)
'
+TRASHDIR=$(pwd)
+test_expect_success 'correct GIT_DIR while using -d' '
+ mkdir drepo &&
+ ( cd drepo &&
+ git init &&
+ test_commit drepo &&
+ git filter-branch -d "$TRASHDIR/dfoo" \
+ --index-filter "cp \"$TRASHDIR\"/dfoo/backup-refs \"$TRASHDIR\"" \
+ ) &&
+ grep drepo "$TRASHDIR/backup-refs"
+'
+
test_expect_success 'Fail if commit filter fails' '
test_must_fail git filter-branch -f --commit-filter "exit 1" HEAD
'