From: Brandon Casey Date: Wed, 25 Aug 2010 17:52:55 +0000 (-0500) Subject: t/t5510: demonstrate failure to fetch when current branch has merge ref X-Git-Tag: v1.7.3-rc1~15^2~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6106ce46;p=git.git t/t5510: demonstrate failure to fetch when current branch has merge ref When 'git fetch' is supplied just a repository URL (not a remote name), and without a fetch refspec, it should fetch from the remote HEAD branch and update FETCH_HEAD with the fetched ref. Currently, when 'git fetch' is called like this, it fails to retrieve anything, and does not update FETCH_HEAD, if the current checked-out branch has a configured merge ref. i.e. this fetch fails to retrieve anything nor update FETCH_HEAD: git checkout master git config branch.master.merge refs/heads/master git fetch git://git.kernel.org/pub/scm/git/git.git but this one does: git config --unset branch.master.merge git fetch git://git.kernel.org/pub/scm/git/git.git Add a test to demonstrate this flaw. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano --- diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index 721821ec9..950b7720e 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -240,6 +240,12 @@ test_expect_success 'fetch with a non-applying branch..merge' ' git fetch blub ' +test_expect_failure 'fetch from GIT URL with a non-applying branch..merge' ' + git update-ref -d FETCH_HEAD && + git fetch one && + git rev-parse --verify FETCH_HEAD +' + # the strange name is: a\!'b test_expect_success 'quoting of a strangely named repo' ' test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&