Rename copy_msg to copy_reflog_msg and make it public.
Signed-off-by: David Turner <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
Signed-off-by: Michael Haggerty <[email protected]>
---
refs-be-files.c | 28 +---------------------------
refs.c | 21 +++++++++++++++++++++
refs.h | 7 +++++++
3 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/refs-be-files.c b/refs-be-files.c
index 0111282..fc8a0a9 100644
--- a/refs-be-files.c
+++ b/refs-be-files.c
@@ -2653,32 +2653,6 @@ static int commit_ref(struct ref_lock *lock)
return 0;
}
-/*
- * copy the reflog message msg to buf, which has been allocated sufficiently
- * large, while cleaning up the whitespaces. Especially, convert LF to space,
- * because reflog file is one line per entry.
- */
-static int copy_msg(char *buf, const char *msg)
-{
- char *cp = buf;
- char c;
- int wasspace = 1;
-
- *cp++ = '\t';
- while ((c = *msg++)) {
- if (wasspace && isspace(c))
- continue;
- wasspace = isspace(c);
- if (wasspace)
- c = ' ';
- *cp++ = c;
- }
- while (buf < cp && isspace(cp[-1]))
- cp--;
- *cp++ = '\n';
- return cp - buf;
-}
-
static int should_autocreate_reflog(const char *refname)
{
if (!log_all_ref_updates)
@@ -2773,7 +2747,7 @@ static int log_ref_write_fd(int fd, const unsigned char
*old_sha1,
sha1_to_hex(new_sha1),
committer);
if (msglen)
- len += copy_msg(logrec + len - 1, msg) - 1;
+ len += copy_reflog_msg(logrec + len - 1, msg) - 1;
written = len <= maxlen ? write_in_full(fd, logrec, len) : -1;
free(logrec);
diff --git a/refs.c b/refs.c
index cd0ab21..c31418d 100644
--- a/refs.c
+++ b/refs.c
@@ -827,6 +827,27 @@ int for_each_remote_ref_submodule(const char *submodule,
each_ref_fn fn, void *c
return for_each_ref_in_submodule(submodule, "refs/remotes/", fn,
cb_data);
}
+int copy_reflog_msg(char *buf, const char *msg)
+{
+ char *cp = buf;
+ char c;
+ int wasspace = 1;
+
+ *cp++ = '\t';
+ while ((c = *msg++)) {
+ if (wasspace && isspace(c))
+ continue;
+ wasspace = isspace(c);
+ if (wasspace)
+ c = ' ';
+ *cp++ = c;
+ }
+ while (buf < cp && isspace(cp[-1]))
+ cp--;
+ *cp++ = '\n';
+ return cp - buf;
+}
+
int head_ref_namespaced(each_ref_fn fn, void *cb_data)
{
struct strbuf buf = STRBUF_INIT;
diff --git a/refs.h b/refs.h
index 927b64d..4951141 100644
--- a/refs.h
+++ b/refs.h
@@ -576,6 +576,13 @@ enum ref_type {
enum ref_type ref_type(const char *refname);
+/*
+ * Copy the reflog message msg to buf, which has been allocated sufficiently
+ * large, while cleaning up the whitespaces. Especially, convert LF to space,
+ * because reflog file is one line per entry.
+ */
+int copy_reflog_msg(char *buf, const char *msg);
+
enum expire_reflog_flags {
EXPIRE_REFLOGS_DRY_RUN = 1 << 0,
EXPIRE_REFLOGS_UPDATE_REF = 1 << 1,
--
2.4.2.658.g6d8523e-twtrsrc
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
