[tokkee]

tokkee.org

Code

projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 46d4947) | patch
t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch
authorSanti Béjar <sbejar@gmail.com>
Mon, 5 Mar 2007 08:09:39 +0000 (09:09 +0100)
committerJunio C Hamano <junkio@cox.net>
Mon, 5 Mar 2007 08:27:37 +0000 (00:27 -0800)
commitac3ec0d5558ed6805e55d5b18bd8ee893fda9065
tree5fda821d47066afcb6b2086a9d039e6cab498a12tree | snapshot
parent46d49472f4d49d13ea77179cd072fc1234985eedcommit | diff
t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
63 files changed:
t/t5515-fetch-merge-logic.sh [new file with mode: 0755] blob
t/t5515/fetch.br-branches-default [new file with mode: 0644] blob
t/t5515/fetch.br-branches-default-merge [new file with mode: 0644] blob
t/t5515/fetch.br-branches-default-merge_branches-default [new file with mode: 0644] blob
t/t5515/fetch.br-branches-default-octopus [new file with mode: 0644] blob
t/t5515/fetch.br-branches-default-octopus_branches-default [new file with mode: 0644] blob
t/t5515/fetch.br-branches-default_branches-default [new file with mode: 0644] blob
t/t5515/fetch.br-branches-one [new file with mode: 0644] blob
t/t5515/fetch.br-branches-one-merge [new file with mode: 0644] blob
t/t5515/fetch.br-branches-one-merge_branches-one [new file with mode: 0644] blob
t/t5515/fetch.br-branches-one-octopus [new file with mode: 0644] blob
t/t5515/fetch.br-branches-one-octopus_branches-one [new file with mode: 0644] blob
t/t5515/fetch.br-branches-one_branches-one [new file with mode: 0644] blob
t/t5515/fetch.br-config-explicit [new file with mode: 0644] blob
t/t5515/fetch.br-config-explicit-merge [new file with mode: 0644] blob
t/t5515/fetch.br-config-explicit-merge_config-explicit [new file with mode: 0644] blob
t/t5515/fetch.br-config-explicit-octopus [new file with mode: 0644] blob
t/t5515/fetch.br-config-explicit-octopus_config-explicit [new file with mode: 0644] blob
t/t5515/fetch.br-config-explicit_config-explicit [new file with mode: 0644] blob
t/t5515/fetch.br-config-glob [new file with mode: 0644] blob
t/t5515/fetch.br-config-glob-merge [new file with mode: 0644] blob
t/t5515/fetch.br-config-glob-merge_config-glob [new file with mode: 0644] blob
t/t5515/fetch.br-config-glob-octopus [new file with mode: 0644] blob
t/t5515/fetch.br-config-glob-octopus_config-glob [new file with mode: 0644] blob
t/t5515/fetch.br-config-glob_config-glob [new file with mode: 0644] blob
t/t5515/fetch.br-remote-explicit [new file with mode: 0644] blob
t/t5515/fetch.br-remote-explicit-merge [new file with mode: 0644] blob
t/t5515/fetch.br-remote-explicit-merge_remote-explicit [new file with mode: 0644] blob
t/t5515/fetch.br-remote-explicit-octopus [new file with mode: 0644] blob
t/t5515/fetch.br-remote-explicit-octopus_remote-explicit [new file with mode: 0644] blob
t/t5515/fetch.br-remote-explicit_remote-explicit [new file with mode: 0644] blob
t/t5515/fetch.br-remote-glob [new file with mode: 0644] blob
t/t5515/fetch.br-remote-glob-merge [new file with mode: 0644] blob
t/t5515/fetch.br-remote-glob-merge_remote-glob [new file with mode: 0644] blob
t/t5515/fetch.br-remote-glob-octopus [new file with mode: 0644] blob
t/t5515/fetch.br-remote-glob-octopus_remote-glob [new file with mode: 0644] blob
t/t5515/fetch.br-remote-glob_remote-glob [new file with mode: 0644] blob
t/t5515/fetch.br-unconfig [new file with mode: 0644] blob
t/t5515/fetch.br-unconfig_--tags_.._.git [new file with mode: 0644] blob
t/t5515/fetch.br-unconfig_.._.git_one [new file with mode: 0644] blob
t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file [new file with mode: 0644] blob
t/t5515/fetch.br-unconfig_.._.git_one_two [new file with mode: 0644] blob
t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file [new file with mode: 0644] blob
t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three [new file with mode: 0644] blob
t/t5515/fetch.br-unconfig_branches-default [new file with mode: 0644] blob
t/t5515/fetch.br-unconfig_branches-one [new file with mode: 0644] blob
t/t5515/fetch.br-unconfig_config-explicit [new file with mode: 0644] blob
t/t5515/fetch.br-unconfig_config-glob [new file with mode: 0644] blob
t/t5515/fetch.br-unconfig_remote-explicit [new file with mode: 0644] blob
t/t5515/fetch.br-unconfig_remote-glob [new file with mode: 0644] blob
t/t5515/fetch.master [new file with mode: 0644] blob
t/t5515/fetch.master_--tags_.._.git [new file with mode: 0644] blob
t/t5515/fetch.master_.._.git_one [new file with mode: 0644] blob
t/t5515/fetch.master_.._.git_one_tag_tag-one_tag_tag-three-file [new file with mode: 0644] blob
t/t5515/fetch.master_.._.git_one_two [new file with mode: 0644] blob
t/t5515/fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file [new file with mode: 0644] blob
t/t5515/fetch.master_.._.git_tag_tag-one_tag_tag-three [new file with mode: 0644] blob
t/t5515/fetch.master_branches-default [new file with mode: 0644] blob
t/t5515/fetch.master_branches-one [new file with mode: 0644] blob
t/t5515/fetch.master_config-explicit [new file with mode: 0644] blob
t/t5515/fetch.master_config-glob [new file with mode: 0644] blob
t/t5515/fetch.master_remote-explicit [new file with mode: 0644] blob
t/t5515/fetch.master_remote-glob [new file with mode: 0644] blob
Git - the stupid content tracker