summaryrefslogtreecommitdiff
path: root/tests/online
diff options
context:
space:
mode:
authorVicent Marti <vicent@github.com>2014-09-15 20:26:12 +0200
committerVicent Marti <vicent@github.com>2014-09-15 20:26:12 +0200
commita7fcac13a5a2590fe930d84fa471713861e76f25 (patch)
tree02bf1033592b23869da930b9c4def991f5fe633f /tests/online
parent3a495c19bd280f5455047a9ac0e936f2c2f2f9a9 (diff)
parentd908351a6c24d2d849e60a62bfb032a34ba96277 (diff)
downloadlibgit2-a7fcac13a5a2590fe930d84fa471713861e76f25.tar.gz
Merge pull request #2554 from linquize/fetch-head-tag
When auto follow tags, FETCH_HEAD should list only newly followed tags
Diffstat (limited to 'tests/online')
-rw-r--r--tests/online/fetchhead.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/online/fetchhead.c b/tests/online/fetchhead.c
index 0b3f20db1..3f27e1331 100644
--- a/tests/online/fetchhead.c
+++ b/tests/online/fetchhead.c
@@ -67,6 +67,11 @@ static void fetchhead_test_fetch(const char *fetchspec, const char *expected_fet
void test_online_fetchhead__wildcard_spec(void)
{
fetchhead_test_clone();
+ fetchhead_test_fetch(NULL, FETCH_HEAD_WILDCARD_DATA2);
+ cl_git_pass(git_tag_delete(g_repo, "annotated_tag"));
+ cl_git_pass(git_tag_delete(g_repo, "blob"));
+ cl_git_pass(git_tag_delete(g_repo, "commit_tree"));
+ cl_git_pass(git_tag_delete(g_repo, "nearly-dangling"));
fetchhead_test_fetch(NULL, FETCH_HEAD_WILDCARD_DATA);
}
@@ -87,5 +92,12 @@ void test_online_fetchhead__no_merges(void)
cl_git_pass(git_config_delete_entry(config, "branch.master.merge"));
git_config_free(config);
+ fetchhead_test_fetch(NULL, FETCH_HEAD_NO_MERGE_DATA2);
+ cl_git_pass(git_tag_delete(g_repo, "annotated_tag"));
+ cl_git_pass(git_tag_delete(g_repo, "blob"));
+ cl_git_pass(git_tag_delete(g_repo, "commit_tree"));
+ cl_git_pass(git_tag_delete(g_repo, "nearly-dangling"));
fetchhead_test_fetch(NULL, FETCH_HEAD_NO_MERGE_DATA);
+ cl_git_pass(git_tag_delete(g_repo, "commit_tree"));
+ fetchhead_test_fetch(NULL, FETCH_HEAD_NO_MERGE_DATA3);
}