threads / patch / 7135

patcht/t5515-fetch-merge-logic.sh: Add two more tests

Subject: [PATCH] t/t5515-fetch-merge-logic.sh: Add two more tests

## tl;dr

One message between Mar 7, 2007 and Mar 7, 2007. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Santi Béjar· Mar 7, 2007, 12:18 UTC · lore
They test the behaviour with just a URL in the command line.
Signed-off-by: Santi Béjar <sbejar@gmail.com>
---
 t/t5515-fetch-merge-logic.sh      |    1 +
 t/t5515/fetch.br-unconfig_.._.git |    2 ++
 t/t5515/fetch.master_.._.git      |    2 ++
 3 files changed, 5 insertions(+), 0 deletions(-)
 create mode 100644 t/t5515/fetch.br-unconfig_.._.git
 create mode 100644 t/t5515/fetch.master_.._.git
Show changes to 3 files +5 −0

t/t5515-fetch-merge-logic.sh, t/t5515/fetch.br-unconfig_.._.git, t/t5515/fetch.master_.._.git

diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh
index 765c83f..0b600bb 100755
--- a/t/t5515-fetch-merge-logic.sh
+++ b/t/t5515-fetch-merge-logic.sh
@@ -114,6 +114,7 @@ done >> tests
 # 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
diff --git a/t/t5515/fetch.br-unconfig_.._.git b/t/t5515/fetch.br-unconfig_.._.git
new file mode 100644
index 0000000..284bb1f
--- /dev/null
+++ b/t/t5515/fetch.br-unconfig_.._.git
@@ -0,0 +1,2 @@
+# br-unconfig ../.git
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b		../
diff --git a/t/t5515/fetch.master_.._.git b/t/t5515/fetch.master_.._.git
new file mode 100644
index 0000000..66d1aad
--- /dev/null
+++ b/t/t5515/fetch.master_.._.git
@@ -0,0 +1,2 @@
+# master ../.git
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b		../
-- 
1.5.0.3.897.g91a70-dirty

← back to recent threads