[PATCH 5/6] Update git to v1.7.9.7

John Keeping john at keeping.me.uk
Sat Mar 2 13:32:14 CET 2013


resolve_ref() is renamed to resolve_ref_unsafe().  CGit's usage is safe.

Signed-off-by: John Keeping <john at keeping.me.uk>
---
 cgit.c | 2 +-
 git    | 2 +-
 2 files changed, 2 insertions(+), 2 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)
 	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 d9f5ef7..d0f1ea6 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit d9f5ef7a4a760d58f1f824f9fb8c12ef0371d3a9
+Subproject commit d0f1ea6003d97e63110fa7d50bb07f546a909b6e
-- 
1.8.2.rc1.339.g93ec2c9





More information about the CGit mailing list