Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'nd/daemon-informative-errors-typofix' into maint
author
Junio C Hamano
<gitster@pobox.com>
Mon, 13 Jan 2014 19:23:07 +0000
(11:23 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 13 Jan 2014 19:23:07 +0000
(11:23 -0800)
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
daemon.c
patch
|
blob
|
history
raw
(from parent 1:
3b72885
)
diff --git
a/daemon.c
b/daemon.c
index 34916c5e105812e36d659dfeeb8341e003e746bd..13608c07c674171ace754154c5d1cb7dea6c5e04 100644
(file)
--- a/
daemon.c
+++ b/
daemon.c
@@
-1278,11
+1278,11
@@
int main(int argc, char **argv)
make_service_overridable(arg + 18, 0);
continue;
}
- if (!
prefix
cmp(arg, "--informative-errors")) {
+ if (!
str
cmp(arg, "--informative-errors")) {
informative_errors = 1;
continue;
}
- if (!
prefix
cmp(arg, "--no-informative-errors")) {
+ if (!
str
cmp(arg, "--no-informative-errors")) {
informative_errors = 0;
continue;
}