diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-08-31 09:39:19 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-08-31 09:39:19 -0700 |
commit | 7e44c93558e7c0b12624d76cf07753d0480ed96a (patch) | |
tree | ac00b198b7cb03e57d8a0e19f550235983f5e52e /builtin-apply.c | |
parent | 34baebcee1d66be4cc096a69ba448cd24dcedf21 (diff) | |
download | git-7e44c93558e7c0b12624d76cf07753d0480ed96a.tar.gz git-7e44c93558e7c0b12624d76cf07753d0480ed96a.tar.xz |
'git foo' program identifies itself without dash in die() messages
This is a mechanical conversion of all '*.c' files with:
s/((?:die|error|warning)\("git)-(\S+:)/$1 $2/;
The result was manually inspected and no false positive was found.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-apply.c')
-rw-r--r-- | builtin-apply.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 40eeabb62..4eb263ec5 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -506,17 +506,17 @@ static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, name = orig_name; len = strlen(name); if (isnull) - die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr); + die("git apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr); another = find_name(line, NULL, p_value, TERM_TAB); if (!another || memcmp(another, name, len)) - die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr); + die("git apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr); free(another); return orig_name; } else { /* expect "/dev/null" */ if (memcmp("/dev/null", line, 9) || line[9] != '\n') - die("git-apply: bad git-diff - expected /dev/null on line %d", linenr); + die("git apply: bad git-diff - expected /dev/null on line %d", linenr); return NULL; } } |