Skip to content

Add git.pullTags setting#67527

Merged
joaomoreno merged 1 commit intomicrosoft:masterfrom
hhu94:pull-tags-setting
May 23, 2019
Merged

Add git.pullTags setting#67527
joaomoreno merged 1 commit intomicrosoft:masterfrom
hhu94:pull-tags-setting

Conversation

@hhu94
Copy link
Contributor

@hhu94 hhu94 commented Jan 30, 2019

Fixes #67424

@joaomoreno joaomoreno added this to the Backlog milestone Jan 31, 2019
@joaomoreno joaomoreno added the git GIT issues label Jan 31, 2019
@alejandroiglesias
Copy link

I was hoping for this to be released in the January release 😞

@hhu94
Copy link
Contributor Author

hhu94 commented Feb 6, 2019

Sadly even if this PR had been merged immediately after creation it would probably still have been put on the Feb release. Hopefully @joaomoreno finds some time to review this, although he's most likely busy with more important work.

@adamtajti
Copy link
Contributor

I think the PR looks fine. I was thinking about this a bit though and I have a small suggestion to make.

Since the default value for the "git.pullTags" settings is true, the behavior will remain the same for those who uses the problematic tag workflow and don't know about the existance of this flag.

I think it would result in a better user experience if we could raise awareness to this flag when the "would clobber existing tag" substring is detected in the err.stdout output of the catch(err) { ... } clause and/or mention the --force switch as a possible workaround.

@alejandroiglesias
Copy link

alejandroiglesias commented Mar 15, 2019

@adamtajti indeed it would be useful to raise awareness of that setting when the error occurs although given it really affects Git sync usage for some of us, it would be better (in my opinion) to have this released without any message on error than waiting much more for somebody to add the message to this PR.

@alejandroiglesias
Copy link

Any update on this?

@nakibmark
Copy link

@joaomoreno we need this merged

@joaomoreno joaomoreno modified the milestones: Backlog, May 2019 May 23, 2019
@joaomoreno joaomoreno self-requested a review May 23, 2019 09:28
Copy link
Member

@joaomoreno joaomoreno left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good, sorry for the delay everyone! Thanks! 🍻

@joaomoreno joaomoreno merged commit 2058f27 into microsoft:master May 23, 2019
@chriskinsman
Copy link

Was awaiting this to land in latest stable release and I find that when using git sync it doesn't appear to work. I have the setting checked to "Fetch all tags when pulling."

I think the issue is that the tag "latest" has changed remotely and so it differs from my local tag. The -f option is required to overwrite the local tag which this doesn't include. Seems like if you are turning this on you might want the -f flag by default. Should it be a different setting?

@nakibmark
Copy link

nakibmark commented Jun 10, 2019

Uncheck that setting, that's the purpose of this PR. It'll run the sync without pulling down tags, and you can pull tags manually with -f in the CLI at some other point if you need to, when it's not disruptive to your development.

@chriskinsman
Copy link

chriskinsman commented Jun 10, 2019 via email

@jextrevor
Copy link

Has this been released? I'm still having this issue in 1.39.2.

@jextrevor
Copy link

Never mind about that. I didn't see the setting at first, but when I unchecked "fetch all tags" sync now works.

@gusbemacbe
Copy link

"git.pullTags": false also worked.

@github-actions github-actions bot locked and limited conversation to collaborators Mar 27, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

git GIT issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

VSCode git sync fails because of tags

8 participants