Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
mercurial
hg-git
Commits
38651d6a59a6
Commit
38651d6a
authored
Nov 22, 2021
by
Dan Villiom Podlaski Christiansen
Browse files
pull: don't add unknown refs
parent
9721b9f36ce5
Pipeline
#29454
failed with stages
in 10 minutes and 17 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
hggit/git_handler.py
View file @
38651d6a
...
...
@@ -1711,7 +1711,9 @@
for
ref_name
,
sha
in
refs
.
items
():
hgsha
=
self
.
map_hg_get
(
sha
)
if
(
if
sha
not
in
self
.
git
:
self
.
ui
.
debug
(
b
'not adding unknown ref %s
\n
'
%
ref_name
)
elif
(
ref_name
.
startswith
(
LOCAL_BRANCH_PREFIX
)
and
hgsha
is
not
None
and
hgsha
in
self
.
repo
):
...
...
tests/test-pull-r-detached.t
View file @
38651d6a
...
...
@@ -72,9 +72,6 @@
add alpha
$ GIT_DIR=$(hg debuggitdir) git tag -ln
error: refs/tags/alpha does not point to a valid object! (no-dulwich01916 !)
error: refs/tags/beta does not point to a valid object!
error: refs/tags/gamma does not point to a valid object!
alpha added tag alpha (dulwich01916 !)
$ cd ..
$ rm -rf hgrepo
...
...
@@ -103,9 +100,6 @@
gamma added tag gamma
#else
$ GIT_DIR=$(hg debuggitdir) git tag -ln
error: refs/tags/alpha does not point to a valid object!
error: refs/tags/beta does not point to a valid object!
error: refs/tags/gamma does not point to a valid object!
#endif
Check how we handle pushing with those missing revisions:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment