diff options
| author | Brandon Casey <drafnel@gmail.com> | 2010-09-09 18:56:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-10 00:16:08 (GMT) |
| commit | 042cca38866569ca8a64c6ef1f95c58b157e4d36 (patch) | |
| tree | ecc11c8b8d4666ee52cd02184391653109787b99 /userdiff.c | |
| parent | f31dbdc7dad3511e1ee73cb04a032773d11231cd (diff) | |
| download | git-042cca38866569ca8a64c6ef1f95c58b157e4d36.zip git-042cca38866569ca8a64c6ef1f95c58b157e4d36.tar.gz git-042cca38866569ca8a64c6ef1f95c58b157e4d36.tar.bz2 | |
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>
Diffstat (limited to 'userdiff.c')
0 files changed, 0 insertions, 0 deletions