summaryrefslogtreecommitdiff
path: root/contrib/fast-import/git-p4.README
diff options
context:
space:
mode:
authorLibravatar Max Horn <max@quendi.de>2014-03-21 12:36:36 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-25 12:05:24 -0700
commit51be46ec4d0b64c1deb60a4814bcd24b6b478eeb (patch)
tree95a7dea28e97d7c03bb4b83de2ba2a561b171322 /contrib/fast-import/git-p4.README
parentGit 1.8.5 (diff)
downloadtgif-51be46ec4d0b64c1deb60a4814bcd24b6b478eeb.tar.xz
remote-hg: do not fail on invalid bookmarks
Mercurial can have bookmarks pointing to "nullid" (the empty root revision), while Git can not have references to it. When cloning or fetching from a Mercurial repository that has such a bookmark, the import failed because git-remote-hg was not be able to create the corresponding reference. Warn the user about the invalid reference, and do not advertise these bookmarks as head refs, but otherwise continue the import. In particular, we still keep track of the fact that the remote repository has a bookmark of the given name, in case the user wants to modify that bookmark. Also add some test cases for this issue. Reported-by: Antoine Pelisse <apelisse@gmail.com> Signed-off-by: Max Horn <max@quendi.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/fast-import/git-p4.README')
0 files changed, 0 insertions, 0 deletions