mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'es/restore-staged-from-head-by-default'
"git restore --staged --worktree" now defaults to take the contents out of "HEAD", instead of erring out. * es/restore-staged-from-head-by-default: restore: default to HEAD when combining --staged and --worktree
This commit is contained in:
commit
4c2941a5fa
|
@ -22,9 +22,8 @@ The command can also be used to restore the content in the index with
|
||||||
`--staged`, or restore both the working tree and the index with
|
`--staged`, or restore both the working tree and the index with
|
||||||
`--staged --worktree`.
|
`--staged --worktree`.
|
||||||
|
|
||||||
By default, the restore sources for working tree and the index are the
|
By default, if `--staged` is given, the contents are restored from `HEAD`,
|
||||||
index and `HEAD` respectively. `--source` could be used to specify a
|
otherwise from the index. Use `--source` to restore from a different commit.
|
||||||
commit as the restore source.
|
|
||||||
|
|
||||||
See "Reset, restore and revert" in linkgit:git[1] for the differences
|
See "Reset, restore and revert" in linkgit:git[1] for the differences
|
||||||
between the three commands.
|
between the three commands.
|
||||||
|
@ -39,10 +38,8 @@ OPTIONS
|
||||||
tree. It is common to specify the source tree by naming a
|
tree. It is common to specify the source tree by naming a
|
||||||
commit, branch or tag associated with it.
|
commit, branch or tag associated with it.
|
||||||
+
|
+
|
||||||
If not specified, the default restore source for the working tree is
|
If not specified, the contents are restored from `HEAD` if `--staged` is
|
||||||
the index, and the default restore source for the index is
|
given, otherwise from the index.
|
||||||
`HEAD`. When both `--staged` and `--worktree` are specified,
|
|
||||||
`--source` must also be specified.
|
|
||||||
|
|
||||||
-p::
|
-p::
|
||||||
--patch::
|
--patch::
|
||||||
|
|
|
@ -1609,10 +1609,10 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
|
||||||
if (opts->checkout_index < 0 || opts->checkout_worktree < 0)
|
if (opts->checkout_index < 0 || opts->checkout_worktree < 0)
|
||||||
BUG("these flags should be non-negative by now");
|
BUG("these flags should be non-negative by now");
|
||||||
/*
|
/*
|
||||||
* convenient shortcut: "git restore --staged" equals
|
* convenient shortcut: "git restore --staged [--worktree]" equals
|
||||||
* "git restore --staged --source HEAD"
|
* "git restore --staged [--worktree] --source HEAD"
|
||||||
*/
|
*/
|
||||||
if (!opts->from_treeish && opts->checkout_index && !opts->checkout_worktree)
|
if (!opts->from_treeish && opts->checkout_index)
|
||||||
opts->from_treeish = "HEAD";
|
opts->from_treeish = "HEAD";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -69,6 +69,17 @@ test_expect_success 'restore --staged uses HEAD as source' '
|
||||||
test_cmp expected actual
|
test_cmp expected actual
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'restore --worktree --staged uses HEAD as source' '
|
||||||
|
test_when_finished git reset --hard &&
|
||||||
|
git show HEAD:./first.t >expected &&
|
||||||
|
echo dirty >>first.t &&
|
||||||
|
git add first.t &&
|
||||||
|
git restore --worktree --staged first.t &&
|
||||||
|
git show :./first.t >actual &&
|
||||||
|
test_cmp expected actual &&
|
||||||
|
test_cmp expected first.t
|
||||||
|
'
|
||||||
|
|
||||||
test_expect_success 'restore --ignore-unmerged ignores unmerged entries' '
|
test_expect_success 'restore --ignore-unmerged ignores unmerged entries' '
|
||||||
git init unmerged &&
|
git init unmerged &&
|
||||||
(
|
(
|
||||||
|
|
Loading…
Reference in a new issue