mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'maint'
* maint: Fix "git-commit -C $tag" Documentation/git-stash.txt: Adjust SYNOPSIS command syntax (2)
This commit is contained in:
commit
d8534adac7
|
@ -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::
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue