summaryrefslogtreecommitdiff
path: root/merge-index.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-31 16:39:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-08-31 16:39:19 (GMT)
commit7e44c93558e7c0b12624d76cf07753d0480ed96a (patch)
treeac00b198b7cb03e57d8a0e19f550235983f5e52e /merge-index.c
parent34baebcee1d66be4cc096a69ba448cd24dcedf21 (diff)
downloadgit-7e44c93558e7c0b12624d76cf07753d0480ed96a.zip
git-7e44c93558e7c0b12624d76cf07753d0480ed96a.tar.gz
git-7e44c93558e7c0b12624d76cf07753d0480ed96a.tar.bz2
'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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/merge-index.c b/merge-index.c
index 7491c56..7827e87 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);
}