diff options
| author |  SZEDER Gábor <szeder@ira.uka.de> | 2015-11-23 13:23:16 +0100 |
|---|---|---|
| committer |  Jeff King <peff@peff.net> | 2015-11-24 18:37:50 -0500 |
| commit | 4d2a3646d1f0285ce072cdfe34a7df64710f9357 (patch) | |
| tree | a8fca2cc3da5b8d85586898646a050d680ddcaa5 /t | |
| parent | Documentation/git-update-index: add missing opts to synopsys (diff) | |
| download | tgif-4d2a3646d1f0285ce072cdfe34a7df64710f9357.tar.xz | |
filter-branch: deal with object name vs. pathname ambiguity in tree-filter
'git filter-branch' fails complaining about an ambiguous argument, if
a tree-filter renames a path and the new pathname happens to match an
existing object name.
After the tree-filter has been applied, 'git filter-branch' looks for
changed paths by running:
git diff-index -r --name-only --ignore-submodules $commit
which then, because of the lack of disambiguating double-dash, can't
decide whether to treat '$commit' as revision or path and errors out.
Add that disambiguating double-dash after 'git diff-index's revision
argument to make sure that '$commit' is interpreted as a revision.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7003-filter-branch.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh index 377c648e04..869e0bf073 100755 --- a/t/t7003-filter-branch.sh +++ b/t/t7003-filter-branch.sh @@ -418,4 +418,11 @@ test_expect_success 'filter commit message without trailing newline' ' test_cmp expect actual ' +test_expect_success 'tree-filter deals with object name vs pathname ambiguity' ' + test_when_finished "git reset --hard original" && + ambiguous=$(git rev-list -1 HEAD) && + git filter-branch --tree-filter "mv file.t $ambiguous" HEAD^.. && + git show HEAD:$ambiguous +' + test_done |