From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Oct 2008 00:58:21 +0000 (-0700)
Subject: Merge branch 'js/maint-fetch-update-head'
X-Git-Tag: v1.6.1-rc1~114
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ca6c06b2efe2f55c498670efcb419bce35678e03;p=git.git

Merge branch 'js/maint-fetch-update-head'

* js/maint-fetch-update-head:
  pull: allow "git pull origin $something:$current_branch" into an unborn branch
  Fix fetch/pull when run without --update-head-ok

Conflicts:
	t/t5510-fetch.sh
---

ca6c06b2efe2f55c498670efcb419bce35678e03
diff --cc t/t5510-fetch.sh
index 9aae4965d,52094e78d..9e679b402
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@@ -303,24 -303,16 +303,36 @@@ test_expect_success 'pushing nonexisten
  
  '
  
 +test_expect_success 'auto tag following fetches minimum' '
 +
 +	cd "$D" &&
 +	git clone .git follow &&
 +	git checkout HEAD^0 &&
 +	(
 +		for i in 1 2 3 4 5 6 7
 +		do
 +			echo $i >>file &&
 +			git commit -m $i -a &&
 +			git tag -a -m $i excess-$i || exit 1
 +		done
 +	) &&
 +	git checkout master &&
 +	(
 +		cd follow &&
 +		git fetch
 +	)
 +'
 +
+ test_expect_success 'refuse to fetch into the current branch' '
+ 
+ 	test_must_fail git fetch . side:master
+ 
+ '
+ 
+ test_expect_success 'fetch into the current branch with --update-head-ok' '
+ 
+ 	git fetch --update-head-ok . side:master
+ 
+ '
+ 
  test_done