summaryrefslogtreecommitdiff
path: root/Git
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-05-30 14:03:04 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-05-30 14:03:04 -0400
commita102f2f1887f2565b3a7908eff8995e6cf04d567 (patch)
treefa389876de1ed479cea38bbd65828fda31dd9728 /Git
parent60330325aa7e38844ef02251e850936902cd084f (diff)
webapp: avoid overwriting remote configs when enabling it
Avoid stomping on existing group and preferred content settings when enabling or combining with an already existing remote. Two level fix. First, use defaultStandardGroup rather than setStandardGroup, so if there is an existing configuration in the git-annex branch, it's not overwritten. To handle pre-existing ssh remotes (including gcrypt), a second level is needed, because before syncing with the remote, it's configuration won't be available locally. (And syncing could take a long time.) So, in this case, keep track of whether the remote is being created or enabled, and only set configs when creating it. This commit was sponsored by Anders Lannerback.
Diffstat (limited to 'Git')
0 files changed, 0 insertions, 0 deletions