]> granicus.if.org Git - cgit/commitdiff
Update git to v1.7.9.7
authorJohn Keeping <john@keeping.me.uk>
Sat, 2 Mar 2013 12:32:14 +0000 (12:32 +0000)
committerJason A. Donenfeld <Jason@zx2c4.com>
Sat, 2 Mar 2013 15:38:03 +0000 (10:38 -0500)
resolve_ref() is renamed to resolve_ref_unsafe().  CGit's usage is safe.

Signed-off-by: John Keeping <john@keeping.me.uk>
cgit.c
git

diff --git a/cgit.c b/cgit.c
index 11edd81cbb69d5b3eab7fe0cdc0c720fea05d951..d6153154211ef03883ab0166aa61cf1327dba309 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -450,7 +450,7 @@ static char *guess_defbranch(const char *repo_path)
        const char *ref;
        unsigned char sha1[20];
 
-       ref = resolve_ref("HEAD", sha1, 0, NULL);
+       ref = resolve_ref_unsafe("HEAD", sha1, 0, NULL);
        if (!ref || prefixcmp(ref, "refs/heads/"))
                return "master";
        return xstrdup(ref + 11);
diff --git a/git b/git
index d9f5ef7a4a760d58f1f824f9fb8c12ef0371d3a9..d0f1ea6003d97e63110fa7d50bb07f546a909b6e 160000 (submodule)
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit d9f5ef7a4a760d58f1f824f9fb8c12ef0371d3a9
+Subproject commit d0f1ea6003d97e63110fa7d50bb07f546a909b6e