summaryrefslogtreecommitdiffstats
path: root/git_config.py
diff options
context:
space:
mode:
authorJohn L. Villalovos <john.l.villalovos@intel.com>2015-01-29 21:58:12 -0800
committerJohn L. Villalovos <john.l.villalovos@intel.com>2015-02-03 13:49:51 -0800
commit126e298214df0ce364b9dae0aec12b7b02f627ce (patch)
tree0a11ceb83a40dd2d7f5353cab84ac81d0269b87b /git_config.py
parent24245e00946b43d086d8bd55cf4facd00479959a (diff)
downloadgit-repo-126e298214df0ce364b9dae0aec12b7b02f627ce.tar.gz
Handle case where 'git remote prune' needs to be run
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>
Diffstat (limited to 'git_config.py')
0 files changed, 0 insertions, 0 deletions