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 /merge-index.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 'merge-index.c')
| -rw-r--r-- | merge-index.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/merge-index.c b/merge-index.c index 7491c56ad..7827e87a9 100644 --- a/merge-index.c +++ b/merge-index.c @@ -27,7 +27,7 @@ static int merge_entry(int pos, const char *path) int found; if (pos >= active_nr) - die("git-merge-index: %s not in the cache", path); + die("git merge-index: %s not in the cache", path); arguments[0] = pgm; arguments[1] = ""; arguments[2] = ""; @@ -53,7 +53,7 @@ static int merge_entry(int pos, const char *path) arguments[stage + 4] = ownbuf[stage]; } while (++pos < active_nr); if (!found) - die("git-merge-index: %s not in the cache", path); + die("git merge-index: %s not in the cache", path); run_program(); return found; } @@ -117,7 +117,7 @@ int main(int argc, char **argv) merge_all(); continue; } - die("git-merge-index: unknown option %s", arg); + die("git merge-index: unknown option %s", arg); } merge_file(arg); } |