diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-02-27 13:57:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-27 13:57:18 -0800 |
| commit | 3e5c63943d35be1804d302c0393affc4916c3dc3 (patch) | |
| tree | 1a6c6eff3113d5e6b0e5d78cf45b59a3c75a4a6b /t | |
| parent | Merge branch 'km/delete-ref-reflog-message' (diff) | |
| parent | remote: ignore failure to remove missing branch.<name>.merge (diff) | |
| download | tgif-3e5c63943d35be1804d302c0393affc4916c3dc3.tar.xz | |
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 '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 535d53fa63..a6c0178f3a 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 && |