Skip to content

add '--tags' to pull auto mode xdefaults#39

Merged
joseluisq merged 1 commit intojoseluisq:masterfrom
lukasgierth:master
Aug 5, 2021
Merged

add '--tags' to pull auto mode xdefaults#39
joseluisq merged 1 commit intojoseluisq:masterfrom
lukasgierth:master

Conversation

@lukasgierth
Copy link
Contributor

@lukasgierth lukasgierth commented Aug 5, 2021

It resolves #36

@joseluisq joseluisq self-assigned this Aug 5, 2021
@joseluisq joseluisq added the enhancement New feature or request label Aug 5, 2021
@joseluisq joseluisq merged commit 79b9681 into joseluisq:master Aug 5, 2021
@joseluisq
Copy link
Owner

Thanks 👍

@joseluisq
Copy link
Owner

joseluisq commented Aug 12, 2021

Just info for future users:
Git can complain when user local tags are not synchronized with remote ones.
For example this below will fail:

~> pull
# From git.server.com:ld/repo
# * branch              develop    -> FETCH_HEAD
# ! [rejected]          2.4.8      -> 2.4.8  (would clobber existing tag)
# ! [rejected]          v2.4.8     -> v2.4.8  (would clobber existing tag)

So to fix this it's necessary to update all local tags via fetch first and then use pull.

~> git fetch --tags -f
# remote: Enumerating objects: 144, done.
# remote: Counting objects: 100% (111/111), done.
# remote: Compressing objects: 100% (63/63), done.
# remote: Total 64 (delta 45), reused 0 (delta 0), pack-reused 0
# Unpacking objects: 100% (64/64), 14.92 KiB | 80.00 KiB/s, done.
# From git.server.com:ld/repo
#  * [new branch]        feature/abc  -> origin/feature/abc
#  t [tag update]        2.4.8               -> 2.4.8
#  t [tag update]        v2.4.8             -> v2.4.8

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

'pull' does not pull tags in auto mode

2 participants