diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-02-27 21:57:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-27 21:57:18 (GMT) |
| commit | 3e5c63943d35be1804d302c0393affc4916c3dc3 (patch) | |
| tree | 1a6c6eff3113d5e6b0e5d78cf45b59a3c75a4a6b /builtin/remote.c | |
| parent | c13c783c9d3d7d3eff937b7bf3642d2a7fe32644 (diff) | |
| parent | 20690b213975ad3e9b1bc851f434d818bd2d1de9 (diff) | |
| download | git-3e5c63943d35be1804d302c0393affc4916c3dc3.zip git-3e5c63943d35be1804d302c0393affc4916c3dc3.tar.gz git-3e5c63943d35be1804d302c0393affc4916c3dc3.tar.bz2 | |
Merge branch 'rl/remote-allow-missing-branch-name-merge'
"git remote rm X", when a branch has remote X configured as the
value of its branch.*.remote, tried to remove branch.*.remote and
branch.*.merge and failed if either is unset.
* rl/remote-allow-missing-branch-name-merge:
remote: ignore failure to remove missing branch.<name>.merge
Diffstat (limited to 'builtin/remote.c')
| -rw-r--r-- | builtin/remote.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/remote.c b/builtin/remote.c index 2b41591..addf97a 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -769,7 +769,9 @@ static int rm(int argc, const char **argv) strbuf_reset(&buf); strbuf_addf(&buf, "branch.%s.%s", item->string, *k); - git_config_set(buf.buf, NULL); + result = git_config_set_gently(buf.buf, NULL); + if (result && result != CONFIG_NOTHING_SET) + die(_("could not unset '%s'"), buf.buf); } } } |