diff options
| author | Jeff King <peff@peff.net> | 2015-12-01 23:32:38 +0100 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2015-12-01 23:32:38 +0100 |
| commit | 40fdcc535783f5c64e6aba9f4b2d2c8997c55a8d (patch) | |
| tree | 95a2da48eec35b7bfacf36beb80b05dcea84d6e1 /git-filter-branch.sh | |
| parent | Merge branch 'fp/subtree-todo-update' (diff) | |
| parent | Merge branch 'eg/p4-submit-catch-failure' into maint (diff) | |
| download | git-40fdcc535783f5c64e6aba9f4b2d2c8997c55a8d.tar.xz git-40fdcc535783f5c64e6aba9f4b2d2c8997c55a8d.zip | |
Merge branch 'maint'
* maint:
http: treat config options sslCAPath and sslCAInfo as paths
Documentation/diff: give --word-diff-regex=. example
filter-branch: deal with object name vs. pathname ambiguity in tree-filter
check-ignore: correct documentation about output
git-p4: clean up after p4 submit failure
git-p4: work with a detached head
git-p4: add option to system() to return subshell status
git-p4: add failing test for submit from detached head
remote-http(s): support SOCKS proxies
t5813: avoid creating urls that break on cygwin
Escape Git's exec path in contrib/rerere-train.sh script
allow hooks to ignore their standard input stream
rebase-i-exec: Allow space in SHELL_PATH
Documentation: make environment variable formatting more consistent
Diffstat (limited to 'git-filter-branch.sh')
| -rwxr-xr-x | git-filter-branch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 27c9c54fbd..cefd1452c6 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -349,7 +349,7 @@ while read commit parents; do die "tree filter failed: $filter_tree" ( - git diff-index -r --name-only --ignore-submodules $commit && + git diff-index -r --name-only --ignore-submodules $commit -- && git ls-files --others ) > "$tempdir"/tree-state || exit git update-index --add --replace --remove --stdin \ |