diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-29 10:20:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-29 10:22:55 -0700 |
| commit | 65281b70caf9dcf926c6649c8c20ef8891d6f3c3 (patch) | |
| tree | 832390dc1381d8af0a5ea63e164e6b106facc15c | |
| parent | f873a273d1381574fd9b2f3f613c0c7e40fe3a1c (diff) | |
| parent | 5853caec96a45ffa7768585acc649dc78eb99354 (diff) | |
| download | git-65281b70caf9dcf926c6649c8c20ef8891d6f3c3.tar.gz | |
Merge commit 'v1.7.2-rc0~6^2' into cc/cherry-pick-stdin
* commit 'v1.7.2-rc0~6^2':
DWIM 'git show -5' to 'git show --do-walk -5'
Documentation/SubmittingPatches: Fix typo in GMail section
Documentation/config: describe status.submodulesummary
This commit fixes one test in t3508 by making "cherry-pick -<num>"
walk the history.
A test update from Elijah Newren is squashed as an evil merge.
| -rw-r--r-- | Documentation/SubmittingPatches | 2 | ||||
| -rw-r--r-- | Documentation/config.txt | 7 | ||||
| -rw-r--r-- | revision.c | 4 | ||||
| -rwxr-xr-x | t/t3508-cherry-pick-many-commits.sh | 2 |
4 files changed, 13 insertions, 2 deletions
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index b9204c77d3..eb53e0636e 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -547,7 +547,7 @@ Gmail GMail does not appear to have any way to turn off line wrapping in the web interface, so this will mangle any emails that you send. You can however -use "git send e-mail" and send your patches through the GMail SMTP server, or +use "git send-email" and send your patches through the GMail SMTP server, or use any IMAP email client to connect to the google IMAP server and forward the emails through that. diff --git a/Documentation/config.txt b/Documentation/config.txt index 87f397ed96..85f763c4d0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1699,6 +1699,13 @@ If this variable is not specified, it defaults to 'normal'. This variable can be overridden with the -u|--untracked-files option of linkgit:git-status[1] and linkgit:git-commit[1]. +status.submodulesummary:: + Defaults to false. + If this is set to a non zero number or true (identical to -1 or an + unlimited number), the submodule summary will be enabled and a + summary of commits for modified submodules will be shown (see + --summary-limit option of linkgit:git-submodule[1]). + tar.umask:: This variable can be used to restrict the permission bits of tar archive entries. The default is 0002, which turns off the diff --git a/revision.c b/revision.c index f4b8b38315..7b881a83fd 100644 --- a/revision.c +++ b/revision.c @@ -1063,18 +1063,22 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg if (!prefixcmp(arg, "--max-count=")) { revs->max_count = atoi(arg + 12); + revs->no_walk = 0; } else if (!prefixcmp(arg, "--skip=")) { revs->skip_count = atoi(arg + 7); } else if ((*arg == '-') && isdigit(arg[1])) { /* accept -<digit>, like traditional "head" */ revs->max_count = atoi(arg + 1); + revs->no_walk = 0; } else if (!strcmp(arg, "-n")) { if (argc <= 1) return error("-n requires an argument"); revs->max_count = atoi(argv[1]); + revs->no_walk = 0; return 2; } else if (!prefixcmp(arg, "-n")) { revs->max_count = atoi(arg + 2); + revs->no_walk = 0; } else if (!prefixcmp(arg, "--max-age=")) { revs->max_age = atoi(arg + 10); } else if (!prefixcmp(arg, "--since=")) { diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh index 93d7189fbc..f90ed3da3e 100755 --- a/t/t3508-cherry-pick-many-commits.sh +++ b/t/t3508-cherry-pick-many-commits.sh @@ -82,7 +82,7 @@ test_expect_success 'revert fourth fourth~1 fourth~2 works' ' git diff --quiet HEAD first ' -test_expect_failure 'cherry-pick -3 fourth works' ' +test_expect_success 'cherry-pick -3 fourth works' ' git checkout -f master && git reset --hard first && test_tick && |