From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "Carlos Martín Nieto" <cmn@elego.de>,
"Michael Schubert" <mschub@elegosoft.com>,
"Johan Herland" <johan@herland.net>, "Jeff King" <peff@peff.net>,
"Marc Branchaud" <marcnarc@xiplink.com>,
"Nicolas Pitre" <nico@fluxnic.net>,
"John Szakmeister" <john@szakmeister.net>,
"Michael Haggerty" <mhagger@alum.mit.edu>
Subject: [PATCH v2 19/23] t5536: new test of refspec conflicts when fetching
Date: Wed, 30 Oct 2013 06:33:08 +0100 [thread overview]
Message-ID: <1383111192-23780-20-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1383111192-23780-1-git-send-email-mhagger@alum.mit.edu>
Add some tests that "git fetch" handles refspec conflicts (i.e., when
the same local reference should be updated from two different remote
references) correctly.
There is a small bug when updating references opportunistically,
namely that an explicit user wish like
git fetch origin \
refs/heads/branch1:refs/remotes/origin/branch2 \
refs/heads/branch2:refs/remotes/origin/branch1
should override a configured refspec like
+refs/heads/*:refs/remotes/origin/*
The current code incorrectly treats this as a fatal error.
In a few commits we will improve the error messages for refspec
conflicts in general and also turn this buggy fatal error into a
warning.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
t/t5536-fetch-conflicts.sh | 96 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 96 insertions(+)
create mode 100755 t/t5536-fetch-conflicts.sh
diff --git a/t/t5536-fetch-conflicts.sh b/t/t5536-fetch-conflicts.sh
new file mode 100755
index 0000000..679c53e
--- /dev/null
+++ b/t/t5536-fetch-conflicts.sh
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+test_description='fetch handles conflicting refspecs correctly'
+
+. ./test-lib.sh
+
+D=$(pwd)
+
+setup_repository () {
+ git init "$1" && (
+ cd "$1" &&
+ git config remote.origin.url "$D" &&
+ shift &&
+ for refspec in "$@"
+ do
+ git config --add remote.origin.fetch "$refspec"
+ done
+ )
+}
+
+verify_stderr () {
+ cat >expected &&
+ # We're not interested in the error
+ # "fatal: The remote end hung up unexpectedly":
+ grep -v "hung up" <error >actual &&
+ test_cmp expected actual
+}
+
+test_expect_success 'setup' '
+ git commit --allow-empty -m "Initial" &&
+ git branch branch1 &&
+ git tag tag1 &&
+ git commit --allow-empty -m "First" &&
+ git branch branch2 &&
+ git tag tag2
+'
+
+test_expect_success 'fetch with no conflict' '
+ setup_repository ok "+refs/heads/*:refs/remotes/origin/*" && (
+ cd ok &&
+ git fetch origin
+ )
+'
+
+test_expect_success 'fetch conflict: config vs. config' '
+ setup_repository ccc \
+ "+refs/heads/branch1:refs/remotes/origin/branch1" \
+ "+refs/heads/branch2:refs/remotes/origin/branch1" && (
+ cd ccc &&
+ test_must_fail git fetch origin 2>error &&
+ verify_stderr <<-\EOF
+ fatal: refs/remotes/origin/branch1 tracks both refs/heads/branch1 and refs/heads/branch2
+ EOF
+ )
+'
+
+test_expect_success 'fetch duplicate: config vs. config' '
+ setup_repository dcc \
+ "+refs/heads/*:refs/remotes/origin/*" \
+ "+refs/heads/branch1:refs/remotes/origin/branch1" && (
+ cd dcc &&
+ git fetch origin
+ )
+'
+
+test_expect_success 'fetch conflict: arg overrides config' '
+ setup_repository aoc \
+ "+refs/heads/*:refs/remotes/origin/*" && (
+ cd aoc &&
+ git fetch origin refs/heads/branch2:refs/remotes/origin/branch1
+ )
+'
+
+test_expect_success 'fetch conflict: arg vs. arg' '
+ setup_repository caa && (
+ cd caa &&
+ test_must_fail git fetch origin \
+ refs/heads/*:refs/remotes/origin/* \
+ refs/heads/branch2:refs/remotes/origin/branch1 2>error &&
+ verify_stderr <<-\EOF
+ fatal: refs/remotes/origin/branch1 tracks both refs/heads/branch1 and refs/heads/branch2
+ EOF
+ )
+'
+
+test_expect_failure 'fetch conflict: criss-cross args' '
+ setup_repository xaa \
+ "+refs/heads/*:refs/remotes/origin/*" && (
+ cd xaa &&
+ git fetch origin \
+ refs/heads/branch1:refs/remotes/origin/branch2 \
+ refs/heads/branch2:refs/remotes/origin/branch1
+ )
+'
+
+test_done
--
1.8.4.1
next prev parent reply other threads:[~2013-10-30 5:42 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-30 5:32 [PATCH v2 00/23] Change semantics of "fetch --tags" Michael Haggerty
2013-10-30 5:32 ` [PATCH v2 01/23] t5510: use the correct tag name in test Michael Haggerty
2013-10-30 5:32 ` [PATCH v2 02/23] t5510: prepare test refs more straightforwardly Michael Haggerty
2013-10-30 10:57 ` Ramkumar Ramachandra
2013-10-30 17:41 ` Michael Haggerty
2013-10-30 5:32 ` [PATCH v2 03/23] t5510: check that "git fetch --prune --tags" does not prune branches Michael Haggerty
2013-10-30 5:32 ` [PATCH v2 04/23] api-remote.txt: correct section "struct refspec" Michael Haggerty
2013-10-30 5:32 ` [PATCH v2 05/23] get_ref_map(): rename local variables Michael Haggerty
2013-10-30 5:32 ` [PATCH v2 06/23] builtin/fetch.c: reorder function definitions Michael Haggerty
2013-10-30 5:32 ` [PATCH v2 07/23] get_expanded_map(): add docstring Michael Haggerty
2013-10-30 5:32 ` [PATCH v2 08/23] get_expanded_map(): avoid memory leak Michael Haggerty
2013-10-30 5:32 ` [PATCH v2 09/23] fetch: only opportunistically update references based on command line Michael Haggerty
2013-10-30 5:32 ` [PATCH v2 10/23] fetch --tags: fetch tags *in addition to* other stuff Michael Haggerty
2013-10-30 5:33 ` [PATCH v2 11/23] fetch --prune: prune only based on explicit refspecs Michael Haggerty
2013-10-30 5:33 ` [PATCH v2 12/23] query_refspecs(): move some constants out of the loop Michael Haggerty
2013-10-30 11:05 ` Ramkumar Ramachandra
2013-10-30 17:31 ` Michael Haggerty
2013-10-30 5:33 ` [PATCH v2 13/23] builtin/remote.c: reorder function definitions Michael Haggerty
2013-10-30 5:33 ` [PATCH v2 14/23] builtin/remote.c:update(): use struct argv_array Michael Haggerty
2013-10-30 5:33 ` [PATCH v2 15/23] fetch, remote: properly convey --no-prune options to subprocesses Michael Haggerty
2013-10-30 5:33 ` [PATCH v2 16/23] fetch-options.txt: simplify ifdef/ifndef/endif usage Michael Haggerty
2013-10-30 5:33 ` [PATCH v2 17/23] git-fetch.txt: improve description of tag auto-following Michael Haggerty
2013-10-30 5:33 ` [PATCH v2 18/23] ref_remove_duplicates(): avoid redundant bisection Michael Haggerty
2013-10-30 5:33 ` Michael Haggerty [this message]
2013-10-30 5:33 ` [PATCH v2 20/23] ref_remove_duplicates(): simplify loop logic Michael Haggerty
2013-10-30 5:33 ` [PATCH v2 21/23] ref_remote_duplicates(): extract a function handle_duplicate() Michael Haggerty
2013-10-30 5:33 ` [PATCH v2 22/23] handle_duplicate(): mark error message for translation Michael Haggerty
2013-10-30 5:33 ` [PATCH v2 23/23] fetch: improve the error messages emitted for conflicting refspecs Michael Haggerty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1383111192-23780-20-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=cmn@elego.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johan@herland.net \
--cc=john@szakmeister.net \
--cc=marcnarc@xiplink.com \
--cc=mschub@elegosoft.com \
--cc=nico@fluxnic.net \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).