From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Nov 2015 23:32:27 +0000 (-0800)
Subject: Merge branch 'ld/p4-import-labels' into maint
X-Git-Tag: v2.6.3~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=04bba3a12b27f592d6d0b8f8af28b2697e55532d;p=thirdparty%2Fgit.git

Merge branch 'ld/p4-import-labels' into maint

Correct "git p4 --detect-labels" so that it does not fail to create
a tag that points at a commit that is also being imported.

* ld/p4-import-labels:
  git-p4: fix P4 label import for unprocessed commits
  git-p4: do not terminate creating tag for unknown commit
  git-p4: failing test for ignoring invalid p4 labels
---

04bba3a12b27f592d6d0b8f8af28b2697e55532d