mirror of
https://gerrit.googlesource.com/git-repo
synced 2024-12-21 07:16:21 +00:00
126e298214
Handle the case when this error occurs:
error: some local refs could not be updated; try running
'git remote prune origin' to remove any old, conflicting branches
This is usually caused by a reference getting changed from a file to a
directory.
For example:
Initially someone creates a branch 'foo' and it is stored as:
.git/refs/remotes/origin/foo
Then later on it is decided to change the layout structure where 'foo'
is a directory with branches below it:
.git/refs/remotes/origin/foo/master
The problem occurs when someone still has
'.git/refs/remotes/origin/foo' on their system and does a repo sync.
When this occurs the error message for needing to do a
'git remote prune origin' occurs.
Now when doing a 'git fetch' if the error message from git says that a
'git remote prune' is needed, it will do the prune and then retry the
fetch.
Change-Id: I4c6f5aa6bd932f0ef7a39134400bedd52e82f633
Signed-off-by: John L. Villalovos <john.l.villalovos@intel.com>
|
||
|---|---|---|
| docs | ||
| hooks | ||
| subcmds | ||
| tests | ||
| .gitattributes | ||
| .gitignore | ||
| .project | ||
| .pydevproject | ||
| .pylintrc | ||
| color.py | ||
| command.py | ||
| COPYING | ||
| editor.py | ||
| error.py | ||
| git_command.py | ||
| git_config.py | ||
| git_refs.py | ||
| git_ssh | ||
| main.py | ||
| manifest_xml.py | ||
| pager.py | ||
| progress.py | ||
| project.py | ||
| pyversion.py | ||
| repo | ||
| SUBMITTING_PATCHES | ||
| trace.py | ||
| wrapper.py | ||