diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-24 18:02:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-24 18:02:04 (GMT) |
| commit | b5442ca101c2d2b6eacaf3428505e5006f2218ae (patch) | |
| tree | 150e6d1da822cb496e0e7ee0b3d856a2c6de5dbe | |
| parent | 25641fcdb0d31130fadd649861035cc7db859cf7 (diff) | |
| parent | ef45e4dae0a0f45fc72b7cd34b32dd465a38697d (diff) | |
| download | git-b5442ca101c2d2b6eacaf3428505e5006f2218ae.zip git-b5442ca101c2d2b6eacaf3428505e5006f2218ae.tar.gz git-b5442ca101c2d2b6eacaf3428505e5006f2218ae.tar.bz2 | |
Merge branch 'maint'
* maint:
parse-options: clarify PARSE_OPT_NOARG description
t3302 (notes): Port to Solaris
| -rw-r--r-- | parse-options.h | 2 | ||||
| -rwxr-xr-x | t/t3302-notes-index-expensive.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/parse-options.h b/parse-options.h index 7435cdb..d982f0f 100644 --- a/parse-options.h +++ b/parse-options.h @@ -69,7 +69,7 @@ typedef int parse_opt_cb(const struct option *, const char *arg, int unset); * `flags`:: * mask of parse_opt_option_flags. * 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_HIDDEN: this option is skipped in the default usage, and * shown only in the full usage. diff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh index 361a10a..8ab333d 100755 --- a/t/t3302-notes-index-expensive.sh +++ b/t/t3302-notes-index-expensive.sh @@ -98,7 +98,7 @@ time_notes () { for mode in no-notes notes do echo $mode - /usr/bin/time sh ../time_notes $mode $1 + /usr/bin/time "$SHELL_PATH" ../time_notes $mode $1 done } |