]> git.ipfire.org Git - thirdparty/git.git/commit - t/t5510-fetch.sh
t/t5510-fetch.sh: improve testing with explicit URL and merge spec
authorBrandon Casey <drafnel@gmail.com>
Thu, 9 Sep 2010 18:56:37 +0000 (13:56 -0500)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Sep 2010 00:16:08 +0000 (17:16 -0700)
commit042cca38866569ca8a64c6ef1f95c58b157e4d36
treeecc11c8b8d4666ee52cd02184391653109787b99
parentf31dbdc7dad3511e1ee73cb04a032773d11231cd
t/t5510-fetch.sh: improve testing with explicit URL and merge spec

Commit 6106ce46 introduced a test to demonstrate fetch's failure to
retrieve any objects or update FETCH_HEAD when it was supplied a repository
URL and the current branch had a configured merge spec.  This commit
expands the original test based on comments from Junio Hamano.  In addition
to actually verifying that the fetch updates FETCH_HEAD correctly, and does
not update the current branch, two more tests are added to ensure that the
merge configuration is ignored even when the supplied URL matches the URL
of the remote configured for the branch.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t5510-fetch.sh