From 356e91f2ecc581f3a446bba566ab1756dc57a583 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Mon, 8 Dec 2014 17:28:45 +0100 Subject: branch: allow -f with -m and -d -f/--force is the standard way to force an action, and is used by branch for the recreation of existing branches, but not for deleting unmerged branches nor for renaming to an existing branch. Make "-m -f" equivalent to "-M" and "-d -f" equivalent to" -D", i.e. allow -f/--force to be used with -m/-d also. For the list modes, "-f" is simply ignored. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- t/t3200-branch.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 't') diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index c08aef4abd..e7bbb8f0ec 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -106,6 +106,11 @@ test_expect_success 'git branch -M o/q o/p should work when o/p exists' ' git branch -M o/q o/p ' +test_expect_success 'git branch -m -f o/q o/p should work when o/p exists' ' + git branch o/q && + git branch -m -f o/q o/p +' + test_expect_success 'git branch -m q r/q should fail when r exists' ' git branch q && git branch r && -- cgit v1.2.3