undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  parse-options: clarify PARSE_OPT_NOARG description
  t3302 (notes): Port to Solaris
This commit is contained in:
Junio C Hamano 2010-08-24 11:02:04 -07:00
commit b5442ca101
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parse-options.h
View File

@ -69,7 +69,7 @@ typedef int parse_opt_cb(const struct option *, const char *arg, int unset);
* `flags`:: * `flags`::
* mask of parse_opt_option_flags. * mask of parse_opt_option_flags.
* PARSE_OPT_OPTARG: says that the argument is optional (not for BOOLEANs) * PARSE_OPT_OPTARG: says that the argument is optional (not for BOOLEANs)
* PARSE_OPT_NOARG: says that this option takes no argument * PARSE_OPT_NOARG: says that this option does not take an argument
* PARSE_OPT_NONEG: says that this option cannot be negated * PARSE_OPT_NONEG: says that this option cannot be negated
* PARSE_OPT_HIDDEN: this option is skipped in the default usage, and * PARSE_OPT_HIDDEN: this option is skipped in the default usage, and
* shown only in the full usage. * shown only in the full usage.

2
t/t3302-notes-index-expensive.sh
View File

@ -98,7 +98,7 @@ time_notes () {
for mode in no-notes notes for mode in no-notes notes
do do
echo $mode echo $mode
/usr/bin/time sh ../time_notes $mode $1 /usr/bin/time "$SHELL_PATH" ../time_notes $mode $1
done done
} }