]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d09b692 a8b0516)
Merge branch 'ls/p4-path-encoding'
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Feb 2017 22:45:12 +0000 (14:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Feb 2017 22:45:12 +0000 (14:45 -0800)
commit5a98255dec1578cc6dc3f25e85d7ea96028687b7
treecd518fc5ec8312d8b9a90f656e3936d38c47bf36tree | snapshot
parentd09b6927978d70ca53126e80d0dc8a070cc06635commit | diff
parenta8b05162e894b88aeb7d5064daba07e1a4f58463commit | diff
Merge branch 'ls/p4-path-encoding'

When "git p4" imports changelist that removes paths, it failed to
convert pathnames when the p4 used encoding different from the one
used on the Git side.  This has been corrected.

* ls/p4-path-encoding:
  git-p4: fix git-p4.pathEncoding for removed files
git-p4.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.