diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-22 18:26:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-22 18:26:55 (GMT) |
| commit | 13e11087fed94279a5364dd87230586fb87baf8b (patch) | |
| tree | b5b1c3f8888ad70d179fa7566ed70523e72eefa5 /t | |
| parent | ad62fd0c2c00aa0cf991d6060cbb13bdd7727319 (diff) | |
| parent | 97276019bb20829c97528b53dc453a37177c35bb (diff) | |
| download | git-13e11087fed94279a5364dd87230586fb87baf8b.zip git-13e11087fed94279a5364dd87230586fb87baf8b.tar.gz git-13e11087fed94279a5364dd87230586fb87baf8b.tar.bz2 | |
Merge branch 'jk/filter-branch-come-back-to-original' into maint
* jk/filter-branch-come-back-to-original:
filter-branch: return to original dir after filtering
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7003-filter-branch.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh index 1e7a209..9496736 100755 --- a/t/t7003-filter-branch.sh +++ b/t/t7003-filter-branch.sh @@ -64,6 +64,20 @@ test_expect_success 'correct GIT_DIR while using -d' ' grep drepo "$TRASHDIR/backup-refs" ' +test_expect_success 'tree-filter works with -d' ' + git init drepo-tree && + ( + cd drepo-tree && + test_commit one && + git filter-branch -d "$TRASHDIR/dfoo" \ + --tree-filter "echo changed >one.t" && + echo changed >expect && + git cat-file blob HEAD:one.t >actual && + test_cmp expect actual && + test_cmp one.t actual + ) +' + test_expect_success 'Fail if commit filter fails' ' test_must_fail git filter-branch -f --commit-filter "exit 1" HEAD ' |