| commit | 5e1288ac9e20aef893e554ed01906c8151646cac | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Oct 2015 19:30:07 +0000 (5 12:30 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Oct 2015 19:30:07 +0000 (5 12:30 -0700) | ||
| tree | 1b3fcb380c47c918c82967c3fe778172b0b5f3fb | treesnapshot (tar.gz zip) |
| parent | 22dd6eb31f85afebce81c0687e7532e78a12aa9d | commitdiff |
| parent | b43702ac56e602d5163ef662fb9caf382da90b94 | commitdiff |
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
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 | blobhistory |