Signed-off-by: Santi Béjar <sbejar@xxxxxxxxx> --- 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 diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh index 6c9cc67..9759959 100755 --- a/t/t5515-fetch-merge-logic.sh +++ b/t/t5515-fetch-merge-logic.sh @@ -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 diff --git a/t/t5515/fetch.br-unconfig_--tags_. b/t/t5515/fetch.br-unconfig_--tags_. new file mode 100644 index 0000000..9435770 --- /dev/null +++ b/t/t5515/fetch.br-unconfig_--tags_. @@ -0,0 +1 @@ +# br-unconfig --tags . diff --git a/t/t5515/fetch.br-unconfig_. b/t/t5515/fetch.br-unconfig_. new file mode 100644 index 0000000..73c937d --- /dev/null +++ b/t/t5515/fetch.br-unconfig_. @@ -0,0 +1 @@ +# br-unconfig . diff --git a/t/t5515/fetch.br-unconfig_._one b/t/t5515/fetch.br-unconfig_._one new file mode 100644 index 0000000..2592023 --- /dev/null +++ b/t/t5515/fetch.br-unconfig_._one @@ -0,0 +1 @@ +# br-unconfig . one diff --git a/t/t5515/fetch.br-unconfig_._one_tag_tag-one_tag_tag-three-file b/t/t5515/fetch.br-unconfig_._one_tag_tag-one_tag_tag-three-file new file mode 100644 index 0000000..3ffeb91 --- /dev/null +++ b/t/t5515/fetch.br-unconfig_._one_tag_tag-one_tag_tag-three-file @@ -0,0 +1 @@ +# br-unconfig . one tag tag-one tag tag-three-file diff --git a/t/t5515/fetch.br-unconfig_._one_two b/t/t5515/fetch.br-unconfig_._one_two new file mode 100644 index 0000000..01e010f --- /dev/null +++ b/t/t5515/fetch.br-unconfig_._one_two @@ -0,0 +1 @@ +# br-unconfig . one two diff --git a/t/t5515/fetch.br-unconfig_._tag_tag-one-tree_tag_tag-three-file b/t/t5515/fetch.br-unconfig_._tag_tag-one-tree_tag_tag-three-file new file mode 100644 index 0000000..e11b24f --- /dev/null +++ b/t/t5515/fetch.br-unconfig_._tag_tag-one-tree_tag_tag-three-file @@ -0,0 +1 @@ +# br-unconfig . tag tag-one-tree tag tag-three-file diff --git a/t/t5515/fetch.br-unconfig_._tag_tag-one_tag_tag-three b/t/t5515/fetch.br-unconfig_._tag_tag-one_tag_tag-three new file mode 100644 index 0000000..15f1d89 --- /dev/null +++ b/t/t5515/fetch.br-unconfig_._tag_tag-one_tag_tag-three @@ -0,0 +1 @@ +# br-unconfig . tag tag-one tag tag-three diff --git a/t/t5515/fetch.master_--tags_. b/t/t5515/fetch.master_--tags_. new file mode 100644 index 0000000..562e00e --- /dev/null +++ b/t/t5515/fetch.master_--tags_. @@ -0,0 +1 @@ +# master --tags . diff --git a/t/t5515/fetch.master_. b/t/t5515/fetch.master_. new file mode 100644 index 0000000..ad16cdc --- /dev/null +++ b/t/t5515/fetch.master_. @@ -0,0 +1 @@ +# master . diff --git a/t/t5515/fetch.master_._one b/t/t5515/fetch.master_._one new file mode 100644 index 0000000..31f3374 --- /dev/null +++ b/t/t5515/fetch.master_._one @@ -0,0 +1 @@ +# master . one diff --git a/t/t5515/fetch.master_._one_tag_tag-one_tag_tag-three-file b/t/t5515/fetch.master_._one_tag_tag-one_tag_tag-three-file new file mode 100644 index 0000000..1df2089 --- /dev/null +++ b/t/t5515/fetch.master_._one_tag_tag-one_tag_tag-three-file @@ -0,0 +1 @@ +# master . one tag tag-one tag tag-three-file diff --git a/t/t5515/fetch.master_._one_two b/t/t5515/fetch.master_._one_two new file mode 100644 index 0000000..7713a87 --- /dev/null +++ b/t/t5515/fetch.master_._one_two @@ -0,0 +1 @@ +# master . one two diff --git a/t/t5515/fetch.master_._tag_tag-one-tree_tag_tag-three-file b/t/t5515/fetch.master_._tag_tag-one-tree_tag_tag-three-file new file mode 100644 index 0000000..564ad9b --- /dev/null +++ b/t/t5515/fetch.master_._tag_tag-one-tree_tag_tag-three-file @@ -0,0 +1 @@ +# master . tag tag-one-tree tag tag-three-file diff --git a/t/t5515/fetch.master_._tag_tag-one_tag_tag-three b/t/t5515/fetch.master_._tag_tag-one_tag_tag-three new file mode 100644 index 0000000..c127c1c --- /dev/null +++ b/t/t5515/fetch.master_._tag_tag-one_tag_tag-three @@ -0,0 +1 @@ +# master . tag tag-one tag tag-three -- 1.5.0.3.1021.g5897 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html