List for cgit developers and users
 help / color / mirror / Atom feed
From: john at keeping.me.uk (John Keeping)
Subject: [PATCH 5/6] Update git to v1.7.9.7
Date: Sat,  2 Mar 2013 12:32:14 +0000	[thread overview]
Message-ID: <b4d53b7d6df354021a9870188b2ad5b19494bc1c.1362227260.git.john@keeping.me.uk> (raw)
In-Reply-To: <cover.1362227260.git.john@keeping.me.uk>

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





  parent reply	other threads:[~2013-03-02 12:32 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-02 12:32 [PATCH 0/6] Update to a more recent Git john
2013-03-02 12:32 ` [PATCH 1/6] Update git to v1.7.5.4 john
2013-03-02 15:12   ` Jason
2013-03-02 12:32 ` [PATCH 2/6] Update git to v1.7.6.5 john
2013-03-02 15:13   ` Jason
2013-03-02 12:32 ` [PATCH 3/6] Update git to v1.7.7.7 john
2013-03-02 15:19   ` Jason
2013-03-02 15:31     ` john
2013-03-02 15:39       ` Jason
2013-03-02 15:50         ` john
2013-03-04  4:53   ` Jason
2013-03-04  9:22     ` john
2013-03-04 14:18       ` Jason
2013-03-02 12:32 ` [PATCH 4/6] Update git to v1.7.8.6 john
2013-03-02 15:20   ` Jason
2013-03-02 12:32 ` john [this message]
2013-03-02 15:21   ` [PATCH 5/6] Update git to v1.7.9.7 Jason
2013-03-02 15:35     ` john
2013-03-02 15:39       ` Jason
2013-03-02 12:32 ` [PATCH 6/6] Update git to v1.7.12.4 john
2013-03-02 15:21   ` Jason
2013-03-02 15:06 ` [PATCH 0/6] Update to a more recent Git mailings
2013-03-02 15:08 ` Jason
2013-03-02 15:28   ` john
2013-03-02 15:32     ` Jason
2013-03-02 15:43 ` Jason
2013-03-02 15:44   ` mailings
2013-03-20 20:21 ` Jason
2013-03-20 20:28   ` john

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b4d53b7d6df354021a9870188b2ad5b19494bc1c.1362227260.git.john@keeping.me.uk \
    --to=cgit@lists.zx2c4.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).