diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-03 00:57:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-03 00:57:23 -0800 |
| commit | d8534adac756a71a897b3a433eaea7992a137b71 (patch) | |
| tree | 2a1418ef780cd916426c6d143c336a4a62231c8f | |
| parent | 991c3dc79f21a52209f9f41a52909cbb9462de1a (diff) | |
| parent | 8a2f87332b847edc7f8fc5f305889c863651ecb5 (diff) | |
| download | git-d8534adac756a71a897b3a433eaea7992a137b71.tar.gz git-d8534adac756a71a897b3a433eaea7992a137b71.tar.xz | |
Merge branch 'maint'
* maint:
Fix "git-commit -C $tag"
Documentation/git-stash.txt: Adjust SYNOPSIS command syntax (2)
| -rw-r--r-- | Documentation/git-stash.txt | 7 | ||||
| -rw-r--r-- | builtin-commit.c | 2 | ||||
| -rwxr-xr-x | t/t7501-commit.sh | 18 |
3 files changed, 23 insertions, 4 deletions
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt index 9889806a5..cd0dc1bd9 100644 --- a/Documentation/git-stash.txt +++ b/Documentation/git-stash.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git-stash' (list | show [<stash>] | apply [<stash>] | clear) -'git-stash' [save] [message...] +'git-stash' [save [<message>]] DESCRIPTION ----------- @@ -36,11 +36,12 @@ is also possible). OPTIONS ------- -save:: +save [<message>]:: Save your local modifications to a new 'stash', and run `git-reset --hard` to revert them. This is the default action when no - subcommand is given. + subcommand is given. The <message> part is optional and gives + the description along with the stashed state. list:: diff --git a/builtin-commit.c b/builtin-commit.c index d8deb1ad0..c787bed69 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -601,7 +601,7 @@ static int parse_and_validate_options(int argc, const char *argv[], if (get_sha1(use_message, sha1)) die("could not lookup commit %s", use_message); - commit = lookup_commit(sha1); + commit = lookup_commit_reference(sha1); if (!commit || parse_commit(commit)) die("could not parse commit %s", use_message); diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index 21dcf550f..361886c3d 100755 --- a/t/t7501-commit.sh +++ b/t/t7501-commit.sh @@ -327,4 +327,22 @@ test_expect_success 'amend using the message from another commit' ' ' +test_expect_success 'amend using the message from a commit named with tag' ' + + git reset --hard && + test_tick && + git commit --allow-empty -m "old commit" && + old=$(git rev-parse --verify HEAD) && + git tag -a -m "tag on old" tagged-old HEAD && + test_tick && + git commit --allow-empty -m "new commit" && + new=$(git rev-parse --verify HEAD) && + test_tick && + git commit --allow-empty --amend -C tagged-old && + git show --pretty="format:%ad %s" "$old" >expected && + git show --pretty="format:%ad %s" HEAD >actual && + diff -u expected actual + +' + test_done |