From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Oct 2015 19:30:07 +0000 (-0700)
Subject: Merge branch 'ld/p4-import-labels'
X-Git-Tag: v2.7.0-rc0~147
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5e1288ac9e20aef893e554ed01906c8151646cac

Merge branch 'ld/p4-import-labels'

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
---

5e1288ac9e20aef893e554ed01906c8151646cac