diff options
| author | Santi B,Ai(Bjar <sbejar@gmail.com> | 2007-03-07 13:18:59 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-07 10:22:44 -0800 |
| commit | e3d842cf12f6ef6d155ef578957cf98d93abe09a (patch) | |
| tree | 7e137b5213838a7877de17ba950ab05f62a34458 | |
| parent | edc04e90f5a79b7805f1188ca94f06ef7eed81f5 (diff) | |
| download | git-e3d842cf12f6ef6d155ef578957cf98d93abe09a.tar.gz git-e3d842cf12f6ef6d155ef578957cf98d93abe09a.tar.xz | |
t/t5515-fetch-merge-logic.sh: Add two more tests
They test the behaviour with just a URL in the command line.
Signed-off-by: Santi B,Ai(Bjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | t/t5515-fetch-merge-logic.sh | 1 | ||||
| -rw-r--r-- | t/t5515/fetch.br-unconfig_.._.git | 2 | ||||
| -rw-r--r-- | t/t5515/fetch.master_.._.git | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh index 765c83fda..0b600bb42 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 000000000..284bb1fb6 --- /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 000000000..66d1aadda --- /dev/null +++ b/t/t5515/fetch.master_.._.git @@ -0,0 +1,2 @@ +# master ../.git +0567da4d5edd2ff4bb292a465ba9e64dcad9536b ../ |