diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-04-22 13:42:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-22 13:42:43 -0700 |
| commit | 8633f213e63412f76d7ded5a0a046c37d84388f5 (patch) | |
| tree | 4cb14c643f1c724833fbc2d09c83949ad52ece2e /git-mergetool.sh | |
| parent | Merge branch 'js/test-junit-finalization-fix' (diff) | |
| parent | import-tars: ignore the global PAX header (diff) | |
| download | tgif-8633f213e63412f76d7ded5a0a046c37d84388f5.tar.xz | |
Merge branch 'js/import-tars-do-not-make-phony-files-from-pax-headers'
The import-tars importer (in contrib/fast-import/) used to create
phony files at the top-level of the repository when the archive
contains global PAX headers, which made its own logic to detect and
omit the common leading directory ineffective, which has been
corrected.
* js/import-tars-do-not-make-phony-files-from-pax-headers:
import-tars: ignore the global PAX header
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions