From: "Santi Béjar" <sbejar@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: [PATCH/RFC 3/3] t/t5515: fixes for the separate fetch and merge logic
Date: Fri, 16 Feb 2007 09:10:41 +0100 [thread overview]
Message-ID: <87r6sqo73y.fsf@gmail.com> (raw)
In-Reply-To: <874ppmplw7.fsf@gmail.com> (Santi Béjar's message of "Fri, 16 Feb 2007 09:06:00 +0100")
1) branch.*.merge no longer must exactly match the remote part
of the branch fetched. Both are expanded in full (as refs/heads/...)
and matched afterwards.
2) When the remote is specified with $GIT_DIR/branches/... and there is
a branch.*.merge, the remote branch name must match to get them merged.
Before the branch in $GIT_DIR/branches/... was always merged.
In the documentation the $GIT_DIR/branches/ is documented as a
short-hand for a corresponding file in $GIT_DIR/remotes/, so I think
this makes the new behaviour consistent.
Signed-off-by: Santi Béjar <sbejar@gmail.com>
---
t/t5515/fetch.br-branches-default-merge | 2 +-
...etch.br-branches-default-merge_branches-default | 2 +-
t/t5515/fetch.br-branches-default-octopus | 2 +-
...ch.br-branches-default-octopus_branches-default | 2 +-
t/t5515/fetch.br-branches-one-merge | 2 +-
t/t5515/fetch.br-branches-one-merge_branches-one | 2 +-
t/t5515/fetch.br-config-glob-octopus | 2 +-
t/t5515/fetch.br-config-glob-octopus_config-glob | 2 +-
t/t5515/fetch.br-remote-glob-octopus | 2 +-
t/t5515/fetch.br-remote-glob-octopus_remote-glob | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/t/t5515/fetch.br-branches-default-merge b/t/t5515/fetch.br-branches-default-merge
index ca85356..28b85e1 100644
--- a/t/t5515/fetch.br-branches-default-merge
+++ b/t/t5515/fetch.br-branches-default-merge
@@ -1,2 +1,2 @@
# br-branches-default-merge
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge
diff --git a/t/t5515/fetch.br-branches-default-merge_branches-default b/t/t5515/fetch.br-branches-default-merge_branches-default
index cb5acac..1d86ad1 100644
--- a/t/t5515/fetch.br-branches-default-merge_branches-default
+++ b/t/t5515/fetch.br-branches-default-merge_branches-default
@@ -1,2 +1,2 @@
# br-branches-default-merge branches-default
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge
diff --git a/t/t5515/fetch.br-branches-default-octopus b/t/t5515/fetch.br-branches-default-octopus
index 002b82e..22bed59 100644
--- a/t/t5515/fetch.br-branches-default-octopus
+++ b/t/t5515/fetch.br-branches-default-octopus
@@ -1,2 +1,2 @@
# br-branches-default-octopus
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge
diff --git a/t/t5515/fetch.br-branches-default-octopus_branches-default b/t/t5515/fetch.br-branches-default-octopus_branches-default
index 7443cf7..c584f16 100644
--- a/t/t5515/fetch.br-branches-default-octopus_branches-default
+++ b/t/t5515/fetch.br-branches-default-octopus_branches-default
@@ -1,2 +1,2 @@
# br-branches-default-octopus branches-default
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge
diff --git a/t/t5515/fetch.br-branches-one-merge b/t/t5515/fetch.br-branches-one-merge
index e594bec..c7f5013 100644
--- a/t/t5515/fetch.br-branches-one-merge
+++ b/t/t5515/fetch.br-branches-one-merge
@@ -1,2 +1,2 @@
# br-branches-one-merge
-8e32a6d901327a23ef831511badce7bf3bf46689
+8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge
diff --git a/t/t5515/fetch.br-branches-one-merge_branches-one b/t/t5515/fetch.br-branches-one-merge_branches-one
index 168031c..1473f5c 100644
--- a/t/t5515/fetch.br-branches-one-merge_branches-one
+++ b/t/t5515/fetch.br-branches-one-merge_branches-one
@@ -1,2 +1,2 @@
# br-branches-one-merge branches-one
-8e32a6d901327a23ef831511badce7bf3bf46689
+8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge
diff --git a/t/t5515/fetch.br-config-glob-octopus b/t/t5515/fetch.br-config-glob-octopus
index da95823..0f324e0 100644
--- a/t/t5515/fetch.br-config-glob-octopus
+++ b/t/t5515/fetch.br-config-glob-octopus
@@ -2,4 +2,4 @@
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge
8e32a6d901327a23ef831511badce7bf3bf46689
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8
diff --git a/t/t5515/fetch.br-config-glob-octopus_config-glob b/t/t5515/fetch.br-config-glob-octopus_config-glob
index 0e7c769..8151e4c 100644
--- a/t/t5515/fetch.br-config-glob-octopus_config-glob
+++ b/t/t5515/fetch.br-config-glob-octopus_config-glob
@@ -2,4 +2,4 @@
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge
8e32a6d901327a23ef831511badce7bf3bf46689
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8
diff --git a/t/t5515/fetch.br-remote-glob-octopus b/t/t5515/fetch.br-remote-glob-octopus
index 92ef25c..4a14384 100644
--- a/t/t5515/fetch.br-remote-glob-octopus
+++ b/t/t5515/fetch.br-remote-glob-octopus
@@ -2,4 +2,4 @@
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge
8e32a6d901327a23ef831511badce7bf3bf46689
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8
diff --git a/t/t5515/fetch.br-remote-glob-octopus_remote-glob b/t/t5515/fetch.br-remote-glob-octopus_remote-glob
index 6ad3726..7f6f928 100644
--- a/t/t5515/fetch.br-remote-glob-octopus_remote-glob
+++ b/t/t5515/fetch.br-remote-glob-octopus_remote-glob
@@ -2,4 +2,4 @@
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge
8e32a6d901327a23ef831511badce7bf3bf46689
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8
--
1.5.0.35.gaaba
next prev parent reply other threads:[~2007-02-16 8:10 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-16 8:06 [PATCH/RFC 0/3] Split fetch and merge logic Santi Béjar
2007-02-16 8:09 ` [PATCH/RFC 2/3] git-fetch: " Santi Béjar
2007-02-19 20:44 ` Junio C Hamano
2007-02-19 22:13 ` Santi Béjar
2007-02-19 23:27 ` Junio C Hamano
2007-02-20 11:21 ` Santi Béjar
2007-02-16 8:10 ` Santi Béjar [this message]
2007-02-16 8:22 ` [PATCH/RFC 0/3] " Junio C Hamano
2007-02-16 8:40 ` Santi Béjar
2007-02-16 20:10 ` Junio C Hamano
2007-02-16 20:30 ` Santi Béjar
2007-02-16 21:14 ` Junio C Hamano
2007-02-19 9:47 ` Santi Béjar
[not found] ` <87zm7eo78x.fsf@gmail.com>
2007-02-16 8:23 ` [PATCH/RFC 1/3] t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch Santi Béjar
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=87r6sqo73y.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).