summaryrefslogtreecommitdiff
path: root/tests-clar/resources/testrepo.git
diff options
context:
space:
mode:
authorBen Straub <bstraub@github.com>2012-05-03 13:58:46 -0700
committerBen Straub <bstraub@github.com>2012-05-11 11:30:47 -0700
commita6346302e6805aea0f1c353bb62944f1ae7352af (patch)
tree2167320af2d24c0ebdffcbd95d354e1a998336b8 /tests-clar/resources/testrepo.git
parent65bc26d54aaf307d0e7eb71d6c5752f88fdca5de (diff)
downloadlibgit2-a6346302e6805aea0f1c353bb62944f1ae7352af.tar.gz
Rev-parse: "ref@{upstream}" syntax.
Added tracking configuration to the test repo's config to support unit tests.
Diffstat (limited to 'tests-clar/resources/testrepo.git')
-rw-r--r--tests-clar/resources/testrepo.git/config4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests-clar/resources/testrepo.git/config b/tests-clar/resources/testrepo.git/config
index 1a5aacdfa..b4fdac6c2 100644
--- a/tests-clar/resources/testrepo.git/config
+++ b/tests-clar/resources/testrepo.git/config
@@ -6,3 +6,7 @@
[remote "test"]
url = git://github.com/libgit2/libgit2
fetch = +refs/heads/*:refs/remotes/test/*
+
+[branch "master"]
+ remote = test
+ merge = refs/heads/master