瀏覽代碼

Better error message when mixing --current-only with a detached HEAD.

tags/v0.3
Ben Kurtovic 9 年之前
父節點
當前提交
fddc0cb465
共有 1 個文件被更改,包括 8 次插入3 次删除
  1. +8
    -3
      gitup/update.py

+ 8
- 3
gitup/update.py 查看文件

@@ -229,20 +229,25 @@ def _update_repository(repo, current_only=False, rebase=False, merge=False):
except TypeError: # Happens when HEAD is detached
active = None
if current_only:
ref = active.tracking_branch() if active else None
if not active:
print(INDENT2, ERROR,
"--current-only doesn't make sense with a detached HEAD.")
return
ref = active.tracking_branch()
if not ref:
print(INDENT2, ERROR, "no remote tracked by current branch.")
return
remotes = [repo.remotes[ref.remote_name]]
else:
remotes = repo.remotes

if not remotes:
print(INDENT2, ERROR, "no remotes configured to fetch.")
return
rebase = rebase or _read_config(repo, "pull.rebase")

_fetch_remotes(remotes)

if not repo.bare:
rebase = rebase or _read_config(repo, "pull.rebase")
_update_branches(repo, active, merge, rebase)

def _update_subdirectories(path, long_name, update_args):


Loading…
取消
儲存