diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-11-03 15:32:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-11-03 15:32:28 -0800 |
| commit | 04bba3a12b27f592d6d0b8f8af28b2697e55532d (patch) | |
| tree | 8dc4f5bca9e4a2bc587d65a38fa9cfd53eb23aae /t/t5810-proto-disable-local.sh | |
| parent | e23469f91a3417e7680cda2402c3c6c4a653cf54 (diff) | |
| parent | b43702ac56e602d5163ef662fb9caf382da90b94 (diff) | |
| download | git-04bba3a12b27f592d6d0b8f8af28b2697e55532d.tar.gz | |
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
Diffstat (limited to 't/t5810-proto-disable-local.sh')
0 files changed, 0 insertions, 0 deletions