From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 May 2016 21:24:05 +0000 (-0700)
Subject: Merge branch 'ky/branch-m-worktree' into maint
X-Git-Tag: v2.8.3~42
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3c383a30c854232b2a678110dd191b639a8b7989?ds=inline;hp=-c

Merge branch 'ky/branch-m-worktree' into maint

When "git worktree" feature is in use, "git branch -m" renamed a
branch that is checked out in another worktree without adjusting
the HEAD symbolic ref for the worktree.

* ky/branch-m-worktree:
set_worktree_head_symref(): fix error message
branch -m: update all per-worktree HEADs
refs: add a new function set_worktree_head_symref
---

3c383a30c854232b2a678110dd191b639a8b7989
diff --combined builtin/branch.c
index 8885d9f8e2,b173831317..de6df09ed3
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@@ -20,7 -20,6 +20,7 @@@
  #include "utf8.h"
  #include "wt-status.h"
  #include "ref-filter.h"
 +#include "worktree.h"
  
  static const char * const builtin_branch_usage[] = {
  	N_("git branch [<options>] [-r | -a] [--merged | --no-merged]"),
@@@ -216,21 -215,16 +216,21 @@@ static int delete_branches(int argc, co
  		int flags = 0;
  
  		strbuf_branchname(&bname, argv[i]);
 -		if (kinds == FILTER_REFS_BRANCHES && !strcmp(head, bname.buf)) {
 -			error(_("Cannot delete the branch '%s' "
 -			      "which you are currently on."), bname.buf);
 -			ret = 1;
 -			continue;
 -		}
 -
  		free(name);
 -
  		name = mkpathdup(fmt, bname.buf);
 +
 +		if (kinds == FILTER_REFS_BRANCHES) {
 +			char *worktree = find_shared_symref("HEAD", name);
 +			if (worktree) {
 +				error(_("Cannot delete branch '%s' "
 +					"checked out at '%s'"),
 +				      bname.buf, worktree);
 +				free(worktree);
 +				ret = 1;
 +				continue;
 +			}
 +		}
 +
  		target = resolve_ref_unsafe(name,
  					    RESOLVE_REF_READING
  					    | RESOLVE_REF_NO_RECURSE
@@@ -558,8 -552,7 +558,7 @@@ static void rename_branch(const char *o
  	if (recovery)
  		warning(_("Renamed a misnamed branch '%s' away"), oldref.buf + 11);
  
- 	/* no need to pass logmsg here as HEAD didn't really move */
- 	if (!strcmp(oldname, head) && create_symref("HEAD", newref.buf, NULL))
+ 	if (replace_each_worktree_head_symref(oldref.buf, newref.buf))
  		die(_("Branch renamed to %s, but HEAD is not updated!"), newname);
  
  	strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11);
diff --combined t/t3200-branch.sh
index 508007fd37,f7d438bd7d..f3e3b6cf2e
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@@ -126,7 -126,28 +126,28 @@@ test_expect_success 'git branch -M foo 
  test_expect_success 'git branch -M baz bam should succeed when baz is checked out' '
  	git checkout -b baz &&
  	git branch bam &&
- 	git branch -M baz bam
+ 	git branch -M baz bam &&
+ 	test $(git rev-parse --abbrev-ref HEAD) = bam
+ '
+ 
+ test_expect_success 'git branch -M baz bam should succeed when baz is checked out as linked working tree' '
+ 	git checkout master &&
+ 	git worktree add -b baz bazdir &&
+ 	git worktree add -f bazdir2 baz &&
+ 	git branch -M baz bam &&
+ 	test $(git -C bazdir rev-parse --abbrev-ref HEAD) = bam &&
+ 	test $(git -C bazdir2 rev-parse --abbrev-ref HEAD) = bam
+ '
+ 
+ test_expect_success 'git branch -M baz bam should succeed within a worktree in which baz is checked out' '
+ 	git checkout -b baz &&
+ 	git worktree add -f bazdir3 baz &&
+ 	(
+ 		cd bazdir3 &&
+ 		git branch -M baz bam &&
+ 		test $(git rev-parse --abbrev-ref HEAD) = bam
+ 	) &&
+ 	test $(git rev-parse --abbrev-ref HEAD) = bam
  '
  
  test_expect_success 'git branch -M master should work when master is checked out' '
@@@ -403,12 -424,6 +424,12 @@@ test_expect_success 'test deleting bran
  	test_i18ncmp expect actual
  '
  
 +test_expect_success 'deleting currently checked out branch fails' '
 +	git worktree add -b my7 my7 &&
 +	test_must_fail git -C my7 branch -d my7 &&
 +	test_must_fail git branch -d my7
 +'
 +
  test_expect_success 'test --track without .fetch entries' '
  	git branch --track my8 &&
  	test "$(git config branch.my8.remote)" &&