[PATCH v5 22/26] refs.c: move should_autocreate_reflog to common code
From: David Turner <hidden>
Date: 2016-06-15 23:07:05
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: David Turner <redacted> Signed-off-by: Junio C Hamano <redacted> Signed-off-by: Michael Haggerty <redacted> --- refs-be-files.c | 10 ---------- refs.c | 10 ++++++++++ refs.h | 2 ++ 3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/refs-be-files.c b/refs-be-files.c
index 23c2f78..680641d 100644
--- a/refs-be-files.c
+++ b/refs-be-files.c@@ -2600,16 +2600,6 @@ static int commit_ref(struct ref_lock *lock) return 0; } -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"); -} - int verify_refname_available(const char *newname, struct string_list *extra, struct string_list *skip, struct strbuf *err) {
diff --git a/refs.c b/refs.c
index 3867549..056c172 100644
--- a/refs.c
+++ b/refs.c@@ -625,6 +625,16 @@ char *resolve_refdup(const char *refname, int resolve_flags, sha1, flags)); } +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"); +} + /* * How to handle various characters in refnames: * 0: An acceptable character for refs
diff --git a/refs.h b/refs.h
index ca60de5..ce99aef 100644
--- a/refs.h
+++ b/refs.h@@ -58,6 +58,8 @@ extern const char *resolve_ref_unsafe(const char *refname, int resolve_flags, extern char *resolve_refdup(const char *refname, int resolve_flags, unsigned char *sha1, int *flags); +extern int should_autocreate_reflog(const char *refname); + extern int read_ref_full(const char *refname, int resolve_flags, unsigned char *sha1, int *flags); extern int read_ref(const char *refname, unsigned char *sha1);
--
2.4.2.658.g6d8523e-twtrsrc