[PATCH 04/10] commit: move resolve_ref() closer to where the return value is used
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 22:52:29
Subsystem:
the rest · Maintainer:
Linus Torvalds
resolve_ref() returns a static buffer and the value may change if another resolve_ref() is called. Move resolve_ref() closer to printf() where the value is used to reduce that chance. Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- builtin/commit.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index 11ae005..365b9f6 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c@@ -1259,7 +1259,7 @@ static void print_summary(const char *prefix, const unsigned char *sha1, struct commit *commit; struct strbuf format = STRBUF_INIT; unsigned char junk_sha1[20]; - const char *head = resolve_ref("HEAD", junk_sha1, 0, NULL, 0); + const char *head; struct pretty_print_context pctx = {0}; struct strbuf author_ident = STRBUF_INIT; struct strbuf committer_ident = STRBUF_INIT;
@@ -1304,6 +1304,7 @@ static void print_summary(const char *prefix, const unsigned char *sha1, rev.diffopt.break_opt = 0; diff_setup_done(&rev.diffopt); + head = resolve_ref("HEAD", junk_sha1, 0, NULL, 0); printf("[%s%s ", !prefixcmp(head, "refs/heads/") ? head + 11 :
--
1.7.4.74.g639db