summaryrefslogtreecommitdiff
path: root/interpolate.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-10-03 04:28:24 -0700
committerJunio C Hamano <gitster@pobox.com>2007-10-03 04:28:24 -0700
commitcc61ae82ec581f6cf1a38a45aaef894f085ccb16 (patch)
treef6127d78a1616ae57452cfb1d9aa9a5f36392af2 /interpolate.c
parent66d4035e1099477aa488c24c0c081ee764f85868 (diff)
parent55246aac6717e86c14f31391ac903ed810d1a9a0 (diff)
downloadgit-cc61ae82ec581f6cf1a38a45aaef894f085ccb16.tar.gz
Merge branch 'mv/unknown'
* mv/unknown: Don't use "<unknown>" for placeholders and suppress printing of empty user formats.
Diffstat (limited to 'interpolate.c')
-rw-r--r--interpolate.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/interpolate.c b/interpolate.c
index 3de583238d..6ef53f2465 100644
--- a/interpolate.c
+++ b/interpolate.c
@@ -73,8 +73,12 @@ unsigned long interpolate(char *result, unsigned long reslen,
/* Check for valid interpolation. */
if (i < ninterps) {
value = interps[i].value;
- valuelen = strlen(value);
+ if (!value) {
+ src += namelen;
+ continue;
+ }
+ valuelen = strlen(value);
if (newlen + valuelen < reslen) {
/* Substitute. */
memcpy(dest, value, valuelen);