| commit | 04bba3a12b27f592d6d0b8f8af28b2697e55532d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Nov 2015 23:32:27 +0000 (3 15:32 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Nov 2015 23:32:28 +0000 (3 15:32 -0800) | ||
| tree | 8dc4f5bca9e4a2bc587d65a38fa9cfd53eb23aae | treesnapshot (tar.gz zip) |
| parent | e23469f91a3417e7680cda2402c3c6c4a653cf54 | commitdiff |
| parent | b43702ac56e602d5163ef662fb9caf382da90b94 | commitdiff |
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
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 |