diff options
| author | Luke Diamand <luke@diamand.org> | 2015-08-27 07:18:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-28 19:02:58 (GMT) |
| commit | b43702ac56e602d5163ef662fb9caf382da90b94 (patch) | |
| tree | 7a191b3f6d5ef25f03b5c00ea8de43c327d3dbbc /t/t9811-git-p4-label-import.sh | |
| parent | 9ab1cfe505d43215a61dc5012632dde66fe109db (diff) | |
| download | git-b43702ac56e602d5163ef662fb9caf382da90b94.zip git-b43702ac56e602d5163ef662fb9caf382da90b94.tar.gz git-b43702ac56e602d5163ef662fb9caf382da90b94.tar.bz2 | |
git-p4: fix P4 label import for unprocessed commits
With --detect-labels enabled, git-p4 will try to create tags
using git fast-import by writing a "tag" clause to the
fast-import stream.
If the commit that the tag references has not yet actually
been processed by fast-import, then the tag can't be created
and git-p4 fails to import the P4 label.
Teach git-p4 to use fast-import "marks" when creating tags
which reference commits created during the current run of the
program.
Commits created before the current run are still referenced
in the old way using a normal git commit.
Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9811-git-p4-label-import.sh')
| -rwxr-xr-x | t/t9811-git-p4-label-import.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9811-git-p4-label-import.sh b/t/t9811-git-p4-label-import.sh index 22d1fd3..decb66b 100755 --- a/t/t9811-git-p4-label-import.sh +++ b/t/t9811-git-p4-label-import.sh @@ -222,7 +222,7 @@ p4_head_revision() { # has not been seen. The presence of a label on a commit # we haven't seen should not cause git-p4 to fail. It should # merely skip that label, and still import other labels. -test_expect_failure 'importing labels with missing revisions' ' +test_expect_success 'importing labels with missing revisions' ' test_when_finished cleanup_git && ( rm -fr "$cli" "$git" && |