Merge branch 'gv/p4-multi-path-commit-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Dec 2016 22:39:25 +0000 (14:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Dec 2016 22:39:25 +0000 (14:39 -0800)
commitf7ba7143876ec168c529f71fbb7918a03e784a7a
tree1cadfd2ff081b8e3d341d8be6c39e6e71d6b7c64
parente6cdbcf013a7977ad1e23715c57a408e2b5b216f
parent9943e5b9799336460ecbbeb86e544cc4a1ad1254
Merge branch 'gv/p4-multi-path-commit-fix' into next

"git p4" that tracks multile p4 paths imported a single changelist
that touches files in these multiple paths as one commit, followed
by many empty commits.  This has been fixed.

* gv/p4-multi-path-commit-fix:
  git-p4: fix multi-path changelist empty commits
git-p4.py
t/t9800-git-p4-basic.sh