git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 22dd6eb b43702a)
Merge branch 'ld/p4-import-labels'
authorJunio C Hamano <redacted>
Mon, 5 Oct 2015 19:30:07 +0000 (12:30 -0700)
committerJunio C Hamano <redacted>
Mon, 5 Oct 2015 19:30:07 +0000 (12:30 -0700)
commit5e1288ac9e20aef893e554ed01906c8151646cac
tree1b3fcb380c47c918c82967c3fe778172b0b5f3fbtree | snapshot
parent22dd6eb31f85afebce81c0687e7532e78a12aa9dcommit | diff
parentb43702ac56e602d5163ef662fb9caf382da90b94commit | diff
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
git-p4.py diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT