Skip to contentSkip to conversation

t/t5515-fetch-merge-logic.sh: Tests with "." as URL.

PATCH Superseded Santi Béjar 1 participant 1 message Jun 15, 2016

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Santi Béjar

author
#0 lore raw

PATCH 1/3 t/t5515-fetch-merge-logic.sh: Tests with "." as URL.

Signed-off-by Santi Béjar <[email protected]>
---
 t/t5515-fetch-merge-logic.sh                       |   18 ++++++++++--------
 t/t5515/fetch.br-unconfig_--tags_.                 |    1 +
 t/t5515/fetch.br-unconfig_.                        |    1 +
 t/t5515/fetch.br-unconfig_._one                    |    1 +
 ...r-unconfig_._one_tag_tag-one_tag_tag-three-file |    1 +
 t/t5515/fetch.br-unconfig_._one_two                |    1 +
 ...-unconfig_._tag_tag-one-tree_tag_tag-three-file |    1 +
 .../fetch.br-unconfig_._tag_tag-one_tag_tag-three  |    1 +
 t/t5515/fetch.master_--tags_.                      |    1 +
 t/t5515/fetch.master_.                             |    1 +
 t/t5515/fetch.master_._one                         |    1 +
 ...tch.master_._one_tag_tag-one_tag_tag-three-file |    1 +
 t/t5515/fetch.master_._one_two                     |    1 +
 ...ch.master_._tag_tag-one-tree_tag_tag-three-file |    1 +
 t/t5515/fetch.master_._tag_tag-one_tag_tag-three   |    1 +
 15 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 t/t5515/fetch.br-unconfig_--tags_.
 create mode 100644 t/t5515/fetch.br-unconfig_.
 create mode 100644 t/t5515/fetch.br-unconfig_._one
 create mode 100644 t/t5515/fetch.br-unconfig_._one_tag_tag-one_tag_tag-three-file
 create mode 100644 t/t5515/fetch.br-unconfig_._one_two
 create mode 100644 t/t5515/fetch.br-unconfig_._tag_tag-one-tree_tag_tag-three-file
 create mode 100644 t/t5515/fetch.br-unconfig_._tag_tag-one_tag_tag-three
 create mode 100644 t/t5515/fetch.master_--tags_.
 create mode 100644 t/t5515/fetch.master_.
 create mode 100644 t/t5515/fetch.master_._one
 create mode 100644 t/t5515/fetch.master_._one_tag_tag-one_tag_tag-three-file
 create mode 100644 t/t5515/fetch.master_._one_two
 create mode 100644 t/t5515/fetch.master_._tag_tag-one-tree_tag_tag-three-file
 create mode 100644 t/t5515/fetch.master_._tag_tag-one_tag_tag-three
t/t5515-fetch-merge-logic.sh +10 -8
index 6c9cc67..9759959 100755
@@ -113,15 +113,17 @@ done >> tests
 # Merge logic does not depend on branch properties
 # neither in the Pull: or .fetch config
 for branch in master br-unconfig ; do
-    cat <<EOF
-$branch ../.git
-$branch ../.git one
-$branch ../.git one two
-$branch --tags ../.git
-$branch ../.git tag tag-one tag tag-three
-$branch ../.git tag tag-one-tree tag tag-three-file
-$branch ../.git one tag tag-one tag tag-three-file
+    for remote in ../.git . ; do
+	cat <<EOF
+$branch $remote
+$branch $remote one
+$branch $remote one two
+$branch --tags $remote
+$branch $remote tag tag-one tag tag-three
+$branch $remote tag tag-one-tree tag tag-three-file
+$branch $remote one tag tag-one tag tag-three-file
 EOF
+    done
 done >> tests
 
 while read cmd
t/t5515/fetch.br-unconfig_--tags_. new file +1 -0
new file mode 100644
index 0000000..9435770
@@ -0,0 +1 @@
+# br-unconfig --tags .
t/t5515/fetch.br-unconfig_. new file +1 -0
new file mode 100644
index 0000000..73c937d
@@ -0,0 +1 @@
+# br-unconfig .
t/t5515/fetch.br-unconfig_._one new file +1 -0
new file mode 100644
index 0000000..2592023
@@ -0,0 +1 @@
+# br-unconfig . one
t/t5515/fetch.br-unconfig_._one_tag_tag-one_tag_tag-three-file new file +1 -0
new file mode 100644
index 0000000..3ffeb91
@@ -0,0 +1 @@
+# br-unconfig . one tag tag-one tag tag-three-file
t/t5515/fetch.br-unconfig_._one_two new file +1 -0
new file mode 100644
index 0000000..01e010f
@@ -0,0 +1 @@
+# br-unconfig . one two
t/t5515/fetch.br-unconfig_._tag_tag-one-tree_tag_tag-three-file new file +1 -0
new file mode 100644
index 0000000..e11b24f
@@ -0,0 +1 @@
+# br-unconfig . tag tag-one-tree tag tag-three-file
t/t5515/fetch.br-unconfig_._tag_tag-one_tag_tag-three new file +1 -0
new file mode 100644
index 0000000..15f1d89
@@ -0,0 +1 @@
+# br-unconfig . tag tag-one tag tag-three
t/t5515/fetch.master_--tags_. new file +1 -0
new file mode 100644
index 0000000..562e00e
@@ -0,0 +1 @@
+# master --tags .
t/t5515/fetch.master_. new file +1 -0
new file mode 100644
index 0000000..ad16cdc
@@ -0,0 +1 @@
+# master .
t/t5515/fetch.master_._one new file +1 -0
new file mode 100644
index 0000000..31f3374
@@ -0,0 +1 @@
+# master . one
t/t5515/fetch.master_._one_tag_tag-one_tag_tag-three-file new file +1 -0
new file mode 100644
index 0000000..1df2089
@@ -0,0 +1 @@
+# master . one tag tag-one tag tag-three-file
t/t5515/fetch.master_._one_two new file +1 -0
new file mode 100644
index 0000000..7713a87
@@ -0,0 +1 @@
+# master . one two
t/t5515/fetch.master_._tag_tag-one-tree_tag_tag-three-file new file +1 -0
new file mode 100644
index 0000000..564ad9b
@@ -0,0 +1 @@
+# master . tag tag-one-tree tag tag-three-file
t/t5515/fetch.master_._tag_tag-one_tag_tag-three new file +1 -0
new file mode 100644
index 0000000..c127c1c
@@ -0,0 +1 @@
+# master . tag tag-one tag tag-three
Signature · 1 line
1.5.0.3.1021.g5897