diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-22 01:03:28 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-22 01:03:28 +0300 |
| commit | 0d9f9424ad12c8e9e71db45776f6bf4a143b90f3 (patch) | |
| tree | 91cc0d2c5d178f32beb6376a2364f40d255b4798 /builtin | |
| parent | d30ec1bece7f56080bac3e5a9f8dbc9f80508fdb (diff) | |
| parent | 20690b213975ad3e9b1bc851f434d818bd2d1de9 (diff) | |
Merge branch 'rl/remote-allow-missing-branch-name-merge' into maint
"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')
| -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 5339ed6ad1..7682206c1e 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); } } } |