git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, mhagger@alum.mit.edu, j6t@kdbg.org
Cc: David Turner <dturner@twopensource.com>
Subject: [PATCH v8 2/7] refs: Break out check for reflog autocreation
Date: Thu,  9 Jul 2015 18:50:55 -0400	[thread overview]
Message-ID: <1436482260-28088-3-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1436482260-28088-1-git-send-email-dturner@twopensource.com>

This is just for clarity.

Signed-off-by: David Turner <dturner@twopensource.com>
---
 refs.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/refs.c b/refs.c
index 03e7505..903b401 100644
--- a/refs.c
+++ b/refs.c
@@ -3118,6 +3118,16 @@ static int copy_msg(char *buf, const char *msg)
 	return cp - buf;
 }
 
+static int should_autocreate_reflog(const char *refname)
+{
+	if (!log_all_ref_updates)
+		return 0;
+	return starts_with(refname, "refs/heads/") ||
+		starts_with(refname, "refs/remotes/") ||
+		starts_with(refname, "refs/notes/") ||
+		!strcmp(refname, "HEAD");
+}
+
 /* This function will fill in *err and return -1 on failure */
 int log_ref_setup(const char *refname, struct strbuf *sb_logfile, struct strbuf *err)
 {
@@ -3128,11 +3138,7 @@ int log_ref_setup(const char *refname, struct strbuf *sb_logfile, struct strbuf
 	logfile = sb_logfile->buf;
 	/* make sure the rest of the function can't change "logfile" */
 	sb_logfile = NULL;
-	if (log_all_ref_updates &&
-	    (starts_with(refname, "refs/heads/") ||
-	     starts_with(refname, "refs/remotes/") ||
-	     starts_with(refname, "refs/notes/") ||
-	     !strcmp(refname, "HEAD"))) {
+	if (should_autocreate_reflog(refname)) {
 		if (safe_create_leading_directories(logfile) < 0) {
 			strbuf_addf(err, "unable to create directory for %s. "
 				    "%s", logfile, strerror(errno));
-- 
2.0.5.499.g01f6352.dirty-twtrsrc

  parent reply	other threads:[~2015-07-09 22:51 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-09 22:50 [PATCH v8 0/7] ref backend preamble David Turner
2015-07-09 22:50 ` [PATCH v8 1/7] refs.c: add err arguments to reflog functions David Turner
2015-07-21 13:17   ` Michael Haggerty
2015-07-09 22:50 ` David Turner [this message]
2015-07-09 22:50 ` [PATCH v8 3/7] refs: new public ref function: safe_create_reflog David Turner
2015-07-09 22:50 ` [PATCH v8 4/7] git-reflog: add exists command David Turner
2015-07-21 13:27   ` Michael Haggerty
2015-07-09 22:50 ` [PATCH v8 5/7] refs: add REF_FORCE_CREATE_REFLOG flag David Turner
2015-07-09 22:50 ` [PATCH v8 6/7] update-ref and tag: add --create-reflog arg David Turner
2015-07-21 13:46   ` Michael Haggerty
2015-07-09 22:51 ` [PATCH v8 7/7] git-stash: use update-ref --create-reflog instead of creating files David Turner
2015-07-10 14:34 ` [PATCH v8 0/7] ref backend preamble Philip Oakley
2015-07-10 17:51   ` David Turner
2015-07-21 14:02 ` Michael Haggerty

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=1436482260-28088-3-git-send-email-dturner@twopensource.com \
    --to=dturner@twopensource.com \
    --cc=git@vger.kernel.org \
    --cc=j6t@kdbg.org \
    --cc=mhagger@alum.mit.edu \
    /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).