From: "Santi Béjar" <sbejar@gmail.com>
To: git <git@vger.kernel.org>
Subject: [PATCH 4/4 (take 4)] Add test for the default merges in fetch.
Date: Sat, 23 Sep 2006 22:55:35 +0200 [thread overview]
Message-ID: <87sliie20o.fsf@gmail.com> (raw)
In-Reply-To: <87ac4qfgvc.fsf@gmail.com> (Santi Béjar's message of "Sat, 23 Sep 2006 22:49:27 +0200")
Signed-off-by: Santi Béjar <sbejar@gmail.com>
---
t/t5510-fetch.sh | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index e71581a..c7faffe
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -27,6 +27,16 @@ test_expect_success "clone and setup chi
echo "URL: ../one/.git/"
echo "Pull: refs/heads/master:refs/heads/one"
} >.git/remotes/one
+ cd .. &&
+ git clone . three &&
+ cd three &&
+ git repo-config branch.master.remote two
+ git repo-config branch.master.merge refs/heads/one
+ {
+ echo "URL: ../two/.git/"
+ echo "Pull: refs/heads/master:refs/heads/two"
+ echo "Pull: refs/heads/one:refs/heads/one"
+ } >.git/remotes/two
'
test_expect_success "fetch test" '
@@ -41,4 +51,17 @@ test_expect_success "fetch test" '
test "z$mine" = "z$his"
'
+test_expect_success "fetch test for-merge" '
+ cd "$D" &&
+ cd three &&
+ git fetch &&
+ test -f .git/refs/heads/two &&
+ test -f .git/refs/heads/one &&
+ {
+ echo -e "not-for-merge branch \047master\047 of ../two/"
+ echo -e " branch \047one\047 of ../two/"
+ } > expected &&
+ cut -f 2- .git/FETCH_HEAD > actual &&
+ diff expected actual'
+
test_done
--
1.4.2.1.g279b
next prev parent reply other threads:[~2006-09-23 20:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-23 20:49 [PATCH 0/4 (take 4)] Fetch: branch properties for fetch Santi Béjar
2006-09-23 20:50 ` [PATCH 1/4 (take 4)] fetch: default remote repository from branch properties Santi Béjar
2006-09-23 20:52 ` [PATCH 2/4 (take 4)] Add t5510 to test per branch configuration affecting git-fetch Santi Béjar
2006-09-23 20:53 ` [PATCH 3/4 (take 4)] fetch: get the remote branches to merge from the branch properties Santi Béjar
2006-09-23 20:55 ` Santi Béjar [this message]
2006-09-24 1:49 ` [PATCH 4/4 (take 4)] Add test for the default merges in fetch Junio C Hamano
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=87sliie20o.fsf@gmail.com \
--to=sbejar@gmail.com \
--cc=git@vger.kernel.org \
/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).