Junio C Hamano fa79937675 branch --set-upstream: regression fix ... The "git branch" command, while not in listing mode, calls create_branch() even when the target branch already exists, and it does so even when it is not interested in updating the value of the branch (i.e. the name of the commit object that sits at the tip of the existing branch). This happens when the command is run with "--set-upstream" option. The earlier safety-measure to prevent "git branch -f $branch $commit" from updating the currently checked out branch did not take it into account, and we no longer can update the tracking information of the current branch. Minimally fix this regression by telling the validation code if it is called to really update the value of a potentially existing branch, or if the caller merely is interested in updating auxiliary aspects of a branch. Reported-and-Tested-by: Jay Soffian Signed-off-by: Junio C Hamano <gitster@pobox.com>		2011-09-16 21:47:47 -07:00
..
add.c	Merge branch 'ci/commit--interactive-atomic'	2011-05-16 16:47:10 -07:00
annotate.c
apply.c	zlib: zlib can only process 4GB at a time	2011-06-10 11:52:15 -07:00
archive.c
bisect--helper.c
blame.c
branch.c	branch --set-upstream: regression fix	2011-09-16 21:47:47 -07:00
bundle.c
cat-file.c	plug a few coverity-spotted leaks	2011-06-20 14:27:36 -07:00
check-attr.c
check-ref-format.c
checkout-index.c	checkout-index: remove obsolete comment	2011-08-17 10:39:47 -07:00
checkout.c	branch --set-upstream: regression fix	2011-09-16 21:47:47 -07:00
clean.c
clone.c	Merge branch 'ab/i18n-fixup' into maint	2011-05-31 12:00:27 -07:00
commit-tree.c
commit.c	Merge branch 'bc/maint-status-z-to-use-porcelain'	2011-06-06 11:40:08 -07:00
config.c	config: Give error message when not changing a multivar	2011-05-17 21:01:29 -07:00
count-objects.c
describe.c
diff-files.c
diff-index.c	Submodules: Use "ignore" settings from .gitmodules too for diff and status	2010-08-09 09:11:44 -07:00
diff-tree.c
diff.c	plug a few coverity-spotted leaks	2011-06-20 14:27:36 -07:00
fast-export.c	Merge branch 'jk/fast-export-quote-path' into maint	2011-08-16 12:41:12 -07:00
fetch-pack.c	fetch-pack: check for valid commit from server	2011-08-18 12:25:54 -07:00
fetch.c	fetch: do not leak a refspec	2011-06-08 17:21:08 -07:00
fmt-merge-msg.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
for-each-ref.c
fsck.c
gc.c	builtin/gc.c: add missing newline in message	2011-06-19 14:46:39 -07:00
grep.c	Merge branch 'mk/grep-pcre'	2011-05-30 00:00:07 -07:00
hash-object.c
help.c
index-pack.c	Merge branch 'jc/zlib-wrap' into maint	2011-08-16 11:23:26 -07:00
init-db.c	Merge branch 'ab/i18n-fixup' into maint	2011-05-31 12:00:27 -07:00
log.c	Merge branch 'jk/format-patch-am'	2011-05-31 12:19:11 -07:00
ls-files.c
ls-remote.c	ls-remote: the --exit-code option reports "no matching refs"	2011-05-18 14:37:46 -07:00
ls-tree.c	Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.	2011-07-25 10:50:11 -07:00
mailinfo.c	mailinfo: always clean up rfc822 header folding	2011-05-26 14:13:38 -07:00
mailsplit.c
merge-base.c
merge-file.c
merge-index.c
merge-ours.c
merge-recursive.c
merge-tree.c
merge.c	Merge branch 'jk/format-patch-am'	2011-05-31 12:19:11 -07:00
mktag.c	read_sha1_file(): get rid of read_sha1_file_repl() madness	2011-05-15 15:23:33 -07:00
mktree.c
mv.c
name-rev.c
notes.c	notes remove: --stdin reads from the standard input	2011-05-19 10:54:16 -07:00
pack-objects.c	zlib: zlib can only process 4GB at a time	2011-06-10 11:52:15 -07:00
pack-redundant.c
pack-refs.c
patch-id.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
prune-packed.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
prune.c
push.c
read-tree.c	Teach read-tree the -n|--dry-run option	2011-05-25 15:04:25 -07:00
receive-pack.c	receive-pack: eliminate duplicate .have refs	2011-05-19 20:02:31 -07:00
reflog.c
remote-ext.c
remote-fd.c
remote.c	Merge branch 'jk/maint-remote-mirror-safer'	2011-05-31 12:08:52 -07:00
replace.c
rerere.c
reset.c	reset [<commit>] paths...: do not mishandle unmerged paths	2011-07-13 21:39:18 -07:00
rev-list.c	Merge branch 'jk/format-patch-am'	2011-05-31 12:19:11 -07:00
rev-parse.c	show: --ignore-missing	2011-05-19 10:55:54 -07:00
revert.c	revert: allow reverting a root commit	2011-05-16 13:01:45 -07:00
rm.c
send-pack.c	Merge branch 'jk/git-connection-deadlock-fix' into maint	2011-05-26 09:33:25 -07:00
shortlog.c	Merge branch 'jk/format-patch-am'	2011-05-31 12:19:11 -07:00
show-branch.c	Merge branch 'jk/format-patch-am'	2011-05-31 12:19:11 -07:00
show-ref.c
stripspace.c
symbolic-ref.c
tag.c	Merge branch 'jk/tag-list-multiple-patterns' into maint	2011-08-16 12:41:14 -07:00
tar-tree.c
unpack-file.c
unpack-objects.c	zlib: zlib can only process 4GB at a time	2011-06-10 11:52:15 -07:00
update-index.c	plug a few coverity-spotted leaks	2011-06-20 14:27:36 -07:00
update-ref.c
update-server-info.c
upload-archive.c
var.c
verify-pack.c
verify-tag.c
write-tree.c