summaryrefslogtreecommitdiff
path: root/contrib/mw-to-git/bin-wrapper
diff options
context:
space:
mode:
authorLibravatar Ross Lagerwall <rosslagerwall@gmail.com>2017-02-18 00:23:41 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-02-21 13:57:41 -0800
commit20690b213975ad3e9b1bc851f434d818bd2d1de9 (patch)
tree7b4a8cbab33be1b7cbc41ed235fbc124d254f4bd /contrib/mw-to-git/bin-wrapper
parentGit 2.11.1 (diff)
downloadtgif-20690b213975ad3e9b1bc851f434d818bd2d1de9.tar.xz
remote: ignore failure to remove missing branch.<name>.merge
It is not all too unusual for a branch to use "branch.<name>.remote" without "branch.<name>.merge". You may be using the 'push.default' configuration set to 'current', for example, and do $ git checkout -b side colleague/side $ git config branch.side.remote colleague However, "git remote rm" to remove the remote used in such a manner fails with "fatal: could not unset 'branch.<name>.merge'" because it assumes that a branch that has .remote defined must also have .merge defined. Detect the "cannot unset because it is not set to begin with" case and ignore it. Signed-off-by: Ross Lagerwall <rosslagerwall@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/mw-to-git/bin-wrapper')
0 files changed, 0 insertions, 0 deletions