mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-19 14:08:16 +02:00
Code

Merge branch 'maint-1.6.6' into maint-1.7.0

Browse Source 
* maint-1.6.6:
  request-pull.txt: Document -p option
  Check size of path buffer before writing into it
  rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
This commit is contained in:
Junio C Hamano 2010-07-25 21:52:48 -07:00
commit 28bf4ba014
4 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-request-pull.txt
View File

@ -7,7 +7,7 @@ git-request-pull - Generates a summary of pending changes
SYNOPSIS
--------
'git request-pull' <start> <url> [<end>]
'git request-pull' [-p] <start> <url> [<end>]
DESCRIPTION
-----------
@ -17,6 +17,9 @@ the given URL in the generated summary.
OPTIONS
-------
-p::
Show patch text
<start>::
Commit to start at.

4
builtin-rev-parse.c
View File

@ -407,8 +407,8 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
ALLOC_GROW(opts, onb + 1, osz);
memset(opts + onb, 0, sizeof(opts[onb]));
argc = parse_options(argc, argv, prefix, opts, usage,
keep_dashdash ? PARSE_OPT_KEEP_DASHDASH : 0 |
stop_at_non_option ? PARSE_OPT_STOP_AT_NON_OPTION : 0);
(keep_dashdash ? PARSE_OPT_KEEP_DASHDASH : 0) |
(stop_at_non_option ? PARSE_OPT_STOP_AT_NON_OPTION : 0));
strbuf_addf(&parsed, " --");
sq_quote_argv(&parsed, argv, 0);

2
setup.c
View File

@ -169,6 +169,8 @@ static int is_git_directory(const char *suspect)
char path[PATH_MAX];
size_t len = strlen(suspect);
if (PATH_MAX <= len + strlen("/objects"))
die("Too long path: %.*s", 60, suspect);
strcpy(path, suspect);
if (getenv(DB_ENVIRONMENT)) {
if (access(getenv(DB_ENVIRONMENT), X_OK))

18
t/t1502-rev-parse-parseopt.sh
View File

@ -79,4 +79,22 @@ test_expect_success 'test --parseopt --keep-dashdash' '
test_cmp expect output
'
cat >expect <<EOF
set -- --foo -- '--' 'arg' '--spam=ham'
EOF
test_expect_success 'test --parseopt --keep-dashdash --stop-at-non-option with --' '
git rev-parse --parseopt --keep-dashdash --stop-at-non-option -- --foo -- arg --spam=ham <optionspec >output &&
test_cmp expect output
'
cat > expect <<EOF
set -- --foo -- 'arg' '--spam=ham'
EOF
test_expect_success 'test --parseopt --keep-dashdash --stop-at-non-option without --' '
git rev-parse --parseopt --keep-dashdash --stop-at-non-option -- --foo arg --spam=ham <optionspec >output &&
test_cmp expect output
'
test_done