diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-06 14:53:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-06 14:53:12 -0700 |
| commit | f0798e6cdbf99515391242e20f8df495a14e9c22 (patch) | |
| tree | de83eeb548197f6c2493a48a617b0f47e4d39a79 /builtin/submodule--helper.c | |
| parent | 578e6021c0819d7be1179e05e7ce0e6fdb2a01b7 (diff) | |
| parent | 353d84c537485500989b190c5af93ad224264e2c (diff) | |
| download | git-f0798e6cdbf99515391242e20f8df495a14e9c22.tar.gz | |
Merge branch 'rs/cocci'
Code clean-up with help from coccinelle tool continues.
* rs/cocci:
coccicheck: make transformation for strbuf_addf(sb, "...") more precise
use strbuf_add_unique_abbrev() for adding short hashes, part 2
use strbuf_addstr() instead of strbuf_addf() with "%s", part 2
gitignore: ignore output files of coccicheck make target
Diffstat (limited to 'builtin/submodule--helper.c')
| -rw-r--r-- | builtin/submodule--helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index e3fdc0aa78..444ec06c2a 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -753,7 +753,7 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce, if (suc->recursive_prefix) strbuf_addf(&sb, "%s/%s", suc->recursive_prefix, ce->name); else - strbuf_addf(&sb, "%s", ce->name); + strbuf_addstr(&sb, ce->name); strbuf_addf(out, _("Skipping unmerged submodule %s"), sb.buf); strbuf_addch(out, '\n'); goto cleanup; |