git remote rename origin upstream fails to fully rename
#888
Comments
|
I've not been able to reproduce this with the same setup (Win10 14393, Powershell) on either the same build or the latest public release (2.11.0): @AArnott have you seen this since reporting this? |
|
Yes. I still see this. I'm currently running git for windows 2.10.2.windows.1 |
|
My git configuration is as follows, in case that's relevant. |
|
@jrbriggs identified the problem as my |
|
@AArnott thanks for following up, and I'm glad you were able to get to the bottom of it! |
dscho
added a commit
to dscho/git
that referenced
this issue
Jan 17, 2017
One of the really nice features of the ~/.gitconfig file is that users can override defaults by their own preferred settings for all of their repositories. One such default that some users like to override is whether the "origin" remote gets auto-pruned or not. The user would simply call git config --global remote.origin.prune true and from now on all "origin" remotes would be pruned automatically when fetching into the local repository. There is just one catch: now Git thinks that the "origin" remote is configured, as it does not discern between having a remote whose fetch (and/or push) URL and refspec is set, and merely having preemptively-configured, global flags for specific remotes. Let's fix this by telling Git that a remote is not configured unless any fetch/push URL or refspect is configured explicitly. As a special exception, we deem a remote configured also when *only* the "vcs" setting is configured. The commit a31eeae (remote: use remote_is_configured() for add and rename, 2016-02-16) specifically extended our test suite to verify this, so it is safe to assume that there has been at least one user with a legitimate use case for this. This fixes git-for-windows#888 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
fengguang
pushed a commit
to 0day-ci/git
that referenced
this issue
Jan 18, 2017
One of the really nice features of the ~/.gitconfig file is that users can override defaults by their own preferred settings for all of their repositories. One such default that some users like to override is whether the "origin" remote gets auto-pruned or not. The user would simply call git config --global remote.origin.prune true and from now on all "origin" remotes would be pruned automatically when fetching into the local repository. There is just one catch: now Git thinks that the "origin" remote is configured, as it does not discern between having a remote whose fetch (and/or push) URL and refspec is set, and merely having preemptively-configured, global flags for specific remotes. Let's fix this by telling Git that a remote is not configured unless any fetch/push URL or refspect is configured explicitly. As a special exception, we deem a remote configured also when *only* the "vcs" setting is configured. The commit a31eeae (remote: use remote_is_configured() for add and rename, 2016-02-16) specifically extended our test suite to verify this, so it is safe to assume that there has been at least one user with a legitimate use case for this. This fixes git-for-windows#888 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
added a commit
to dscho/git
that referenced
this issue
Jan 19, 2017
One of the really nice features of the ~/.gitconfig file is that users can override defaults by their own preferred settings for all of their repositories. One such default that some users like to override is whether the "origin" remote gets auto-pruned or not. The user would simply call git config --global remote.origin.prune true and from now on all "origin" remotes would be pruned automatically when fetching into the local repository. There is just one catch: now Git thinks that the "origin" remote is configured, even if the repository config has no [remote "origin"] section at all, as it does not realize that the "prune" setting was configured globally and that there really is no "origin" remote configured in this repository. That is a problem e.g. when renaming a remote to a new name, when Git may be fooled into thinking that there is already a remote of that new name. Let's fix this by paying more attention to *where* the remote settings came from: if they are configured in the local repository config, we must not overwrite them. If they were configured elsewhere, we cannot overwrite them to begin with, as we only write the repository config. There is only one caller of remote_is_configured() (in `git fetch`) that may want to take remotes into account even if they were configured outside the repository config; all other callers essentially try to prevent the Git command from overwriting settings in the repository config. To accommodate that fact, the remote_is_configured() function now requires a parameter that states whether the caller is interested in all remotes, or only in those that were configured in the repository config. Many thanks to Jeff King whose tireless review helped with settling for nothing less than the current strategy. This fixes git-for-windows#888 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
gitster
pushed a commit
to git/git
that referenced
this issue
Jan 19, 2017
One of the really nice features of the ~/.gitconfig file is that users can override defaults by their own preferred settings for all of their repositories. One such default that some users like to override is whether the "origin" remote gets auto-pruned or not. The user would simply call git config --global remote.origin.prune true and from now on all "origin" remotes would be pruned automatically when fetching into the local repository. There is just one catch: now Git thinks that the "origin" remote is configured, even if the repository config has no [remote "origin"] section at all, as it does not realize that the "prune" setting was configured globally and that there really is no "origin" remote configured in this repository. That is a problem e.g. when renaming a remote to a new name, when Git may be fooled into thinking that there is already a remote of that new name. Let's fix this by paying more attention to *where* the remote settings came from: if they are configured in the local repository config, we must not overwrite them. If they were configured elsewhere, we cannot overwrite them to begin with, as we only write the repository config. There is only one caller of remote_is_configured() (in `git fetch`) that may want to take remotes into account even if they were configured outside the repository config; all other callers essentially try to prevent the Git command from overwriting settings in the repository config. To accommodate that fact, the remote_is_configured() function now requires a parameter that states whether the caller is interested in all remotes, or only in those that were configured in the repository config. Many thanks to Jeff King whose tireless review helped with settling for nothing less than the current strategy. This fixes git-for-windows#888 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
or closed issue
matching what I'm seeing
Setup
Windows 10, 64-bit
defaults?
All defaults.
to the issue you're seeing?
No.
Details
PowerShell
Minimal, Complete, and Verifiable example
this will help us understand the issue.
Just one remote:
originAlso, if I add a
git remotecommand in between the two renames, to see just one remote (upstream), but instead I see two (upstream and origin).URL to that repository to help us with testing?
It happens to all repos.
The text was updated successfully, but these errors were encountered: