From: Han-Wen Nienhuys <hanwen@xxxxxxxxxx>
Commit 523fa69c ("reflog: cleanse messages in the refs.c layer") standardizes
how write entries into the reflog. This commit standardizes how we get messages
out of the reflog. Before, the files backend implicitly added '\n' to the end of
reflog message on reading, which creates a subtle incompatibility with alternate
ref storage backends, such as reftable.
We address this by stripping LF from the message before we pass it to the
user-provided callback.
Signed-off-by: Han-Wen Nienhuys <hanwen@xxxxxxxxxx>
---
builtin/show-branch.c | 5 -----
reflog-walk.c | 6 ++----
refs/files-backend.c | 30 +++++++++++++++---------------
t/t1405-main-ref-store.sh | 5 ++---
t/t1406-submodule-ref-store.sh | 4 ++--
5 files changed, 21 insertions(+), 29 deletions(-)
diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 902a0d99850..58a894e81e2 100644
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -762,7 +762,6 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
char *logmsg;
char *nth_desc;
const char *msg;
- char *end;
timestamp_t timestamp;
int tz;
@@ -773,10 +772,6 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
break;
}
- end = strchr(logmsg, '\n');
- if (end)
- *end = '\0';
-
msg = (*logmsg == '\0') ? "(none)" : logmsg;
reflog_msg[i] = xstrfmt("(%s) %s",
show_date(timestamp, tz,
diff --git a/reflog-walk.c b/reflog-walk.c
index e9cd3283694..944cce929c8 100644
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -245,8 +245,6 @@ void get_reflog_message(struct strbuf *sb,
info = &commit_reflog->reflogs->items[commit_reflog->recno+1];
len = strlen(info->message);
- if (len > 0)
- len--; /* strip away trailing newline */
strbuf_add(sb, info->message, len);
}
@@ -285,10 +283,10 @@ void show_reflog_message(struct reflog_walk_info *reflog_info, int oneline,
info = &commit_reflog->reflogs->items[commit_reflog->recno+1];
get_reflog_selector(&selector, reflog_info, dmode, force_date, 0);
if (oneline) {
- printf("%s: %s", selector.buf, info->message);
+ printf("%s: %s\n", selector.buf, info->message);
}
else {
- printf("Reflog: %s (%s)\nReflog message: %s",
+ printf("Reflog: %s (%s)\nReflog message: %s\n",
selector.buf, info->email, info->message);
}
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 677b7e4cdd2..206c9f8b932 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1897,17 +1897,15 @@ static int show_one_reflog_ent(struct strbuf *sb, each_reflog_ent_fn fn, void *c
int tz;
const char *p = sb->buf;
- /* old SP new SP name <email> SP time TAB msg LF */
- if (!sb->len || sb->buf[sb->len - 1] != '\n' ||
- parse_oid_hex(p, &ooid, &p) || *p++ != ' ' ||
+ /* old SP new SP name <email> SP time TAB msg */
+ if (!sb->len || parse_oid_hex(p, &ooid, &p) || *p++ != ' ' ||
parse_oid_hex(p, &noid, &p) || *p++ != ' ' ||
- !(email_end = strchr(p, '>')) ||
- email_end[1] != ' ' ||
+ !(email_end = strchr(p, '>')) || email_end[1] != ' ' ||
!(timestamp = parse_timestamp(email_end + 2, &message, 10)) ||
!message || message[0] != ' ' ||
- (message[1] != '+' && message[1] != '-') ||
- !isdigit(message[2]) || !isdigit(message[3]) ||
- !isdigit(message[4]) || !isdigit(message[5]))
+ (message[1] != '+' && message[1] != '-') || !isdigit(message[2]) ||
+ !isdigit(message[3]) || !isdigit(message[4]) ||
+ !isdigit(message[5]))
return 0; /* corrupt? */
email_end[1] = '\0';
tz = strtol(message + 1, NULL, 10);
@@ -1999,6 +1997,7 @@ static int files_for_each_reflog_ent_reverse(struct ref_store *ref_store,
strbuf_splice(&sb, 0, 0, bp + 1, endp - (bp + 1));
scanp = bp;
endp = bp + 1;
+ strbuf_trim_trailing_newline(&sb);
ret = show_one_reflog_ent(&sb, fn, cb_data);
strbuf_reset(&sb);
if (ret)
@@ -2011,6 +2010,7 @@ static int files_for_each_reflog_ent_reverse(struct ref_store *ref_store,
* Process it, and we can end the loop.
*/
strbuf_splice(&sb, 0, 0, buf, endp - buf);
+ strbuf_trim_trailing_newline(&sb);
ret = show_one_reflog_ent(&sb, fn, cb_data);
strbuf_reset(&sb);
break;
@@ -2060,7 +2060,7 @@ static int files_for_each_reflog_ent(struct ref_store *ref_store,
if (!logfp)
return -1;
- while (!ret && !strbuf_getwholeline(&sb, logfp, '\n'))
+ while (!ret && !strbuf_getline(&sb, logfp))
ret = show_one_reflog_ent(&sb, fn, cb_data);
fclose(logfp);
strbuf_release(&sb);
@@ -3020,18 +3020,18 @@ static int expire_reflog_ent(struct object_id *ooid, struct object_id *noid,
if ((*cb->should_prune_fn)(ooid, noid, email, timestamp, tz,
message, policy_cb)) {
if (!cb->newlog)
- printf("would prune %s", message);
+ printf("would prune %s\n", message);
else if (cb->flags & EXPIRE_REFLOGS_VERBOSE)
- printf("prune %s", message);
+ printf("prune %s\n", message);
} else {
if (cb->newlog) {
- fprintf(cb->newlog, "%s %s %s %"PRItime" %+05d\t%s",
- oid_to_hex(ooid), oid_to_hex(noid),
- email, timestamp, tz, message);
+ fprintf(cb->newlog, "%s %s %s %" PRItime " %+05d\t%s\n",
+ oid_to_hex(ooid), oid_to_hex(noid), email,
+ timestamp, tz, message);
oidcpy(&cb->last_kept_oid, noid);
}
if (cb->flags & EXPIRE_REFLOGS_VERBOSE)
- printf("keep %s", message);
+ printf("keep %s\n", message);
}
return 0;
}
diff --git a/t/t1405-main-ref-store.sh b/t/t1405-main-ref-store.sh
index 49718b7ea7f..a600bedf2cd 100755
--- a/t/t1405-main-ref-store.sh
+++ b/t/t1405-main-ref-store.sh
@@ -89,13 +89,12 @@ test_expect_success 'for_each_reflog()' '
test_expect_success 'for_each_reflog_ent()' '
$RUN for-each-reflog-ent HEAD >actual &&
head -n1 actual | grep one &&
- tail -n2 actual | head -n1 | grep recreate-main
+ tail -n1 actual | grep recreate-main
'
test_expect_success 'for_each_reflog_ent_reverse()' '
$RUN for-each-reflog-ent-reverse HEAD >actual &&
- head -n1 actual | grep recreate-main &&
- tail -n2 actual | head -n1 | grep one
+ tail -n1 actual | grep one
'
test_expect_success 'reflog_exists(HEAD)' '
diff --git a/t/t1406-submodule-ref-store.sh b/t/t1406-submodule-ref-store.sh
index 0a87058971e..b0365c1fee0 100755
--- a/t/t1406-submodule-ref-store.sh
+++ b/t/t1406-submodule-ref-store.sh
@@ -74,13 +74,13 @@ test_expect_success 'for_each_reflog()' '
test_expect_success 'for_each_reflog_ent()' '
$RUN for-each-reflog-ent HEAD >actual &&
head -n1 actual | grep first &&
- tail -n2 actual | head -n1 | grep main.to.new
+ tail -n1 actual | grep main.to.new
'
test_expect_success 'for_each_reflog_ent_reverse()' '
$RUN for-each-reflog-ent-reverse HEAD >actual &&
head -n1 actual | grep main.to.new &&
- tail -n2 actual | head -n1 | grep first
+ tail -n1 actual | grep first
'
test_expect_success 'reflog_exists(HEAD)' '
--
gitgitgadget
