From ca593f795994badf7cd543d24d1ed24aabc0d8e1 Mon Sep 17 00:00:00 2001 From: Dirk Suesserott Date: Wed, 9 Apr 2008 22:20:10 +0200 Subject: Documentation/git-request-pull: Fixed a typo ("send" -> "end") Signed-off-by: Dirk Suesserott Signed-off-by: Junio C Hamano --- Documentation/git-request-pull.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-request-pull.txt b/Documentation/git-request-pull.txt index 270df9b185..9a14c04e39 100644 --- a/Documentation/git-request-pull.txt +++ b/Documentation/git-request-pull.txt @@ -24,7 +24,7 @@ OPTIONS URL to include in the summary. :: - Commit to send at; defaults to HEAD. + Commit to end at; defaults to HEAD. Author ------ -- cgit v1.2.3 From d4ba07cac576e87fd194df0853ed523af6c58af1 Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Thu, 10 Apr 2008 13:33:09 +0200 Subject: Document option --only of git commit Its documentation was removed by 6c96753 (Documentation/git-commit: rewrite to make it more end-user friendly, 2006-12-08), even though it is referenced from a few places, including builtin-commit.c (as part of the commentary in the commit message template). Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- Documentation/git-commit.txt | 11 +++++++++++ builtin-commit.c | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index c3725b2ed9..488d873f43 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -139,6 +139,17 @@ but can be used to amend a merge commit. as well. This is usually not what you want unless you are concluding a conflicted merge. +-o|--only:: + Make a commit only from the paths specified on the + command line, disregarding any contents that have been + staged so far. This is the default mode of operation of + 'git commit' if any paths are given on the command line, + in which case this option can be omitted. + If this option is specified together with '--amend', then + no paths need be specified, which can be used to amend + the last commit without committing changes that have + already been staged. + -u|--untracked-files:: Show all untracked files, also those in uninteresting directories, in the "Untracked files:" section of commit diff --git a/builtin-commit.c b/builtin-commit.c index 45232a11c4..a228a43f75 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -97,7 +97,7 @@ static struct option builtin_commit_options[] = { OPT_BOOLEAN('a', "all", &all, "commit all changed files"), OPT_BOOLEAN('i', "include", &also, "add specified files to index for commit"), OPT_BOOLEAN(0, "interactive", &interactive, "interactively add files"), - OPT_BOOLEAN('o', "only", &only, ""), + OPT_BOOLEAN('o', "only", &only, "commit only specified files"), OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"), OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"), OPT_BOOLEAN(0, "untracked-files", &untracked_files, "show all untracked files"), -- cgit v1.2.3 From 055b66158c984c4e902735ab2a1a188509423f43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Steinbrink?= Date: Fri, 11 Apr 2008 22:52:07 +0200 Subject: Fix section about backdating tags in the git-tag docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The tagger is equal to the committer, not the author, so GIT_COMMITTER_DATE is the right environment variable to use, not GIT_AUTHOR_DATE. Signed-off-by: Björn Steinbrink Signed-off-by: Junio C Hamano --- Documentation/git-tag.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index 74b461f661..b729595984 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -226,14 +226,14 @@ the tag object affects, for example, the ordering of tags in the gitweb interface. To set the date used in future tag objects, set the environment -variable GIT_AUTHOR_DATE to one or more of the date and time. The +variable GIT_COMMITTER_DATE to one or more of the date and time. The date and time can be specified in a number of ways; the most common is "YYYY-MM-DD HH:MM". An example follows. ------------ -$ GIT_AUTHOR_DATE="2006-10-02 10:31" git tag -s v1.0.1 +$ GIT_COMMITTER_DATE="2006-10-02 10:31" git tag -s v1.0.1 ------------ -- cgit v1.2.3 From a710522bfc9ae6e27ce4bea573d1d223af6a6f8e Mon Sep 17 00:00:00 2001 From: Michele Ballabio Date: Thu, 10 Apr 2008 22:06:52 +0200 Subject: revision.c: make --date-order overriddable Jan Engelhardt noticed that while --topo-order can be overridden by a subsequent --date-order, the reverse was not possible. That's because setup_revisions() failed to set revs->lifo properly. Signed-off-by: Michele Ballabio Signed-off-by: Junio C Hamano --- revision.c | 1 + 1 file changed, 1 insertion(+) diff --git a/revision.c b/revision.c index a399f27144..d79f2b3a7b 100644 --- a/revision.c +++ b/revision.c @@ -1019,6 +1019,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch continue; } if (!strcmp(arg, "--topo-order")) { + revs->lifo = 1; revs->topo_order = 1; continue; } -- cgit v1.2.3 From e3389075c6160c46cf0e2a443deab1966628ed57 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 12 Apr 2008 07:53:59 +0200 Subject: bisect: fix bad rev checking in "git bisect good" It seems that "git bisect good" and "git bisect skip" have never properly checked arguments that have been passed to them. As soon as one of them can be parsed as a SHA1, no error or warning would be given. This is because 'git rev-parse --revs-only --no-flags "$@"' always "exit 0" and outputs all the SHA1 it can found from parsing "$@". This patch fix this by using, for each "bisect good" argument, the same logic as for the "bisect bad" argument. While at it, this patch teaches "bisect bad" to give a meaningfull error message when it is passed more than one argument. Note that if "git bisect good" or "git bisect skip" is given some proper revs and then something that is not a proper rev, then the first proper revs will still have been marked as "good" or "skip". Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- git-bisect.sh | 14 +++++--------- t/t6030-bisect-porcelain.sh | 13 +++++++++++++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/git-bisect.sh b/git-bisect.sh index f8857747c4..c8be9f7e8a 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -151,20 +151,16 @@ bisect_state() { rev=$(git rev-parse --verify HEAD) || die "Bad rev input: HEAD" bisect_write "$state" "$rev" ;; - 2,bad) - rev=$(git rev-parse --verify "$2^{commit}") || - die "Bad rev input: $2" - bisect_write "$state" "$rev" ;; - *,good|*,skip) + 2,bad|*,good|*,skip) shift - revs=$(git rev-parse --revs-only --no-flags "$@") && - test '' != "$revs" || die "Bad rev input: $@" - for rev in $revs + for rev in "$@" do rev=$(git rev-parse --verify "$rev^{commit}") || - die "Bad rev commit: $rev^{commit}" + die "Bad rev input: $rev" bisect_write "$state" "$rev" done ;; + *,bad) + die "'git bisect bad' can take only one argument." ;; *) usage ;; esac diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 4908e878fe..dc87f13558 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -71,6 +71,19 @@ test_expect_success 'bisect start with one bad and good' ' git bisect next ' +test_expect_success 'bisect good and bad fails if not given only revs' ' + git bisect reset && + git bisect start && + test_must_fail git bisect good foo $HASH1 && + test_must_fail git bisect good $HASH1 bar && + test_must_fail git bisect bad frotz && + test_must_fail git bisect bad $HASH3 $HASH4 && + test_must_fail git bisect skip bar $HASH3 && + test_must_fail git bisect skip $HASH1 foo && + git bisect good $HASH1 && + git bisect bad $HASH4 +' + test_expect_success 'bisect reset: back in the master branch' ' git bisect reset && echo "* master" > branch.expect && -- cgit v1.2.3