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 /t | |
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 't')
-rwxr-xr-x | t/t5505-remote.sh | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index ba46e86de0..3ea27107c2 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -153,6 +153,25 @@ test_expect_success 'remove errors out early when deleting non-existent branch' ) ' +test_expect_success 'remove remote with a branch without configured merge' ' + test_when_finished "( + git -C test checkout master; + git -C test branch -D two; + git -C test config --remove-section remote.two; + git -C test config --remove-section branch.second; + true + )" && + ( + cd test && + git remote add two ../two && + git fetch two && + git checkout -b second two/master^0 && + git config branch.second.remote two && + git checkout master && + git remote rm two + ) +' + test_expect_success 'rename errors out early when deleting non-existent branch' ' ( cd test && |