summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-13 19:23:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-01-13 19:23:07 (GMT)
commit7fd90e0e72d489916f08b359b036dfc7b22c7513 (patch)
treeec5b5f7591682f9fc4f8b155cf57c2ab4e900aaa
parent3b72885bd8bd8dbd68a48d630e4e99633c93ab6f (diff)
parent82246b765bdfc191aa809cf3dd672de18ad6352a (diff)
downloadgit-7fd90e0e72d489916f08b359b036dfc7b22c7513.zip
git-7fd90e0e72d489916f08b359b036dfc7b22c7513.tar.gz
git-7fd90e0e72d489916f08b359b036dfc7b22c7513.tar.bz2
Merge branch 'nd/daemon-informative-errors-typofix' into maint
The "--[no-]informative-errors" options to "git daemon" were parsed a bit too loosely, allowing any other string after these option names. * nd/daemon-informative-errors-typofix: daemon: be strict at parsing parameters --[no-]informative-errors
-rw-r--r--daemon.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/daemon.c b/daemon.c
index 34916c5..13608c0 100644
--- a/daemon.c
+++ b/daemon.c
@@ -1278,11 +1278,11 @@ int main(int argc, char **argv)
make_service_overridable(arg + 18, 0);
continue;
}
- if (!prefixcmp(arg, "--informative-errors")) {
+ if (!strcmp(arg, "--informative-errors")) {
informative_errors = 1;
continue;
}
- if (!prefixcmp(arg, "--no-informative-errors")) {
+ if (!strcmp(arg, "--no-informative-errors")) {
informative_errors = 0;
continue;
}