Updating paths is incompatible with switching branchesforcing

Posted by / 19-Jul-2015 15:24

Updating paths is incompatible with switching branchesforcing

In case anyone else struggles with the utter craziness of all this: git fetch origin/branchname Is not the same as git fetch.

The former simply results in "new (next fetch will store in remotes/origin)" displaying in a column visible via git remote show origin.

This is a big security issue, in that people MUST be able to trust their tag-names.

If you really want to do the insane thing, you need to just fess up to it, and tell people that you messed up.

I'm glad I've been able to help people out this way.

Well, now I'm always doing "git fetch --all -t" before the checkout, but in some cases the branches created from the tag seem to be pointing to an old deploy instead of the last one. @Sergi, tags are intended to remain fixed, but a name like "deploy" implies you will be changing it frequently.

No, that's what cvs, subversion, mercurial, and bazaar (to name a few) use revert to mean, but not git. Thankfully, you can undo your revert with another 'git revert', I just learned.

[root ~]# git clone git://github.com/Markus Q/puppet Initialized empty Git repository in /root/puppet/.git/ remote: Counting objects: 51418, done.

I’m working up a similarly targeted patch for you to try, but the real solution will be to refactor that code.

Should have a sketch of a solution up as a for-testing-only branch in a few minutes. It broke other things and was inadequate as a solution to the present ticket. There’s an added complexity due to the initial prefix (01.) being taken as the start of a numeric IP address, so the approach I was considering won’t suffice.

This way the rest of developers could branch from the last good point on the deployment branch.

Any idea why sometimes do I get branches pointing to and old deploy?

updating paths is incompatible with switching branchesforcing-81updating paths is incompatible with switching branchesforcing-33updating paths is incompatible with switching branchesforcing-44

But the Git documentation is very explicit about the fact that tags shouldn't be changed or reused.

One thought on “updating paths is incompatible with switching branchesforcing”

  1. A: Because if they all went, it would be called hell. Girlfriend: I want to end up our relationship, I am going to return you everything you gave me..