about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJohn Keeping2013-03-02 12:32:14 +0000
committerJason A. Donenfeld2013-03-02 10:38:03 -0500
commit10628b0e52f860f8c95c476f61a98a31b79ce776 (patch)
treecfd776471cae4c1d18eb13703c796fe917ff37e5
parentUpdate git to v1.7.8.6 (diff)
downloadcgit-10628b0e52f860f8c95c476f61a98a31b79ce776.tar.gz
cgit-10628b0e52f860f8c95c476f61a98a31b79ce776.zip
Update git to v1.7.9.7
resolve_ref() is renamed to resolve_ref_unsafe().  CGit's usage is safe.

Signed-off-by: John Keeping <john@keeping.me.uk>
-rw-r--r--cgit.c2
m---------git0
2 files changed, 1 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c index 11edd81..d615315 100644 --- a/cgit.c +++ b/cgit.c
@@ -450,7 +450,7 @@ static char *guess_defbranch(const char *repo_path)
450 const char *ref; 450 const char *ref;
451 unsigned char sha1[20]; 451 unsigned char sha1[20];
452 452
453 ref = resolve_ref("HEAD", sha1, 0, NULL); 453 ref = resolve_ref_unsafe("HEAD", sha1, 0, NULL);
454 if (!ref || prefixcmp(ref, "refs/heads/")) 454 if (!ref || prefixcmp(ref, "refs/heads/"))
455 return "master"; 455 return "master";
456 return xstrdup(ref + 11); 456 return xstrdup(ref + 11);
diff --git a/git b/git
Subproject d9f5ef7a4a760d58f1f824f9fb8c12ef0371d3a Subproject d0f1ea6003d97e63110fa7d50bb07f546a909b6