[PATCH v5 4/4] builtin/branch: strip refs/heads/ using skip_prefix
From: Kaartic Sivaraam <hidden>
Date: 2017-12-01 06:03:09
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2017-12-08 · Re: [PATCH v5 4/4] builtin/branch: strip refs/heads/ using skip_prefix · Kaartic Sivaraam <hidden>
- 2017-12-07 · Re: [PATCH v5 4/4] builtin/branch: strip refs/heads/ using skip_prefix · Junio C Hamano <hidden>
- 2017-12-07 · Re: [PATCH v5 4/4] builtin/branch: strip refs/heads/ using skip_prefix · Junio C Hamano <hidden>
Instead of hard-coding the offset strlen("refs/heads/") to skip
the prefix "refs/heads/" use the skip_prefix() function which
is more communicative and verifies that the string actually
starts with that prefix.
Signed-off-by: Kaartic Sivaraam <redacted>
---
Sorry, missed a ';' in v4.
The surprising thing I discovered in the TravisCI build for v4
was that apart from the 'Documentation' build the 'Static Analysis'
build passed, with the following output,
-- <snip>
$ ci/run-static-analysis.sh
GIT_VERSION = 2.13.1.1972.g6ced3f745
SPATCH contrib/coccinelle/array.cocci
SPATCH result: contrib/coccinelle/array.cocci.patch
SPATCH contrib/coccinelle/free.cocci
SPATCH contrib/coccinelle/object_id.cocci
SPATCH contrib/coccinelle/qsort.cocci
SPATCH contrib/coccinelle/strbuf.cocci
SPATCH result: contrib/coccinelle/strbuf.cocci.patch
SPATCH contrib/coccinelle/swap.cocci
SPATCH contrib/coccinelle/xstrdup_or_null.cocci
The command "ci/run-static-analysis.sh" exited with 0.
-- <snip> --
+Cc: SZEDER
I guess static analysis tools make an assumption that the source
code is syntactically valid for them to work correctly. So, I guess
we should at least make sure the code 'compiles' before running
the static analysis tool even though we don't build it completely.
I'm not sure if it's a bad thing to run the static analysis on code
that isn't syntactically valid, though.
builtin/branch.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index ca9d8abd0..196d5fe9b 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c@@ -462,6 +462,8 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int { struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT; struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT; + const char *interpreted_oldname = NULL; + const char *interpreted_newname = NULL; int recovery = 0; int clobber_head_ok;
@@ -493,6 +495,11 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int reject_rebase_or_bisect_branch(oldref.buf); + if (!skip_prefix(oldref.buf, "refs/heads/", &interpreted_oldname) || + !skip_prefix(newref.buf, "refs/heads/", &interpreted_newname)) { + die("BUG: expected prefix missing for refs"); + } + if (copy) strbuf_addf(&logmsg, "Branch: copied %s to %s", oldref.buf, newref.buf);
@@ -508,10 +515,10 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int if (recovery) { if (copy) warning(_("Created a copy of a misnamed branch '%s'"), - oldref.buf + 11); + interpreted_oldname); else warning(_("Renamed a misnamed branch '%s' away"), - oldref.buf + 11); + interpreted_oldname); } if (!copy &&
@@ -520,9 +527,9 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int strbuf_release(&logmsg); - strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11); + strbuf_addf(&oldsection, "branch.%s", interpreted_oldname); strbuf_release(&oldref); - strbuf_addf(&newsection, "branch.%s", newref.buf + 11); + strbuf_addf(&newsection, "branch.%s", interpreted_newname); strbuf_release(&newref); if (!copy && git_config_rename_section(oldsection.buf, newsection.buf) < 0) die(_("Branch is renamed, but update of config-file failed"));
--
2.15.0.531.g2ccb3012c