summaryrefslogtreecommitdiffstats
path: root/error.py
diff options
context:
space:
mode:
authorAnatol Pomazau <anatol@google.com>2012-03-20 13:45:00 -0700
committerShawn O. Pearce <sop@google.com>2012-03-20 14:11:56 -0700
commitcd7c5deca0b0594bd8addd5a0fe18b962d2679e9 (patch)
treeec56d17e669c94bd297d8080f4f5bbb226a4841c /error.py
parente02ac0af2e69f2c149de942d639bf305e5ae391a (diff)
downloadgit-repo-cd7c5deca0b0594bd8addd5a0fe18b962d2679e9.tar.gz
Do not change branch.foo.merge in case of manifest sync
In case of manifest/smart sync repo changes ".merge" config option from branch to SHA. Doing 'repo upload' fails as repo tries to upload to a remote branch that looks like SHA (e.g. refs/for/23423423423423423423423) Do not update the .merge in case if revision is SHA. Change-Id: I9139708fa17f21eec5a7e23c3255333626bf529e
Diffstat (limited to 'error.py')
0 files changed, 0 insertions, 0 deletions