summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2020-05-05 07:17:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-05-05 18:27:38 (GMT)
commit088018e34d705aad696acfeb624cfe5552ba256f (patch)
tree9b01540e27bf191fee28c00586eaba938dc1774e /t
parentaf6b65d45ef179ed52087e80cb089f6b2349f4ec (diff)
downloadgit-088018e34d705aad696acfeb624cfe5552ba256f.zip
git-088018e34d705aad696acfeb624cfe5552ba256f.tar.gz
git-088018e34d705aad696acfeb624cfe5552ba256f.tar.bz2
restore: default to HEAD when combining --staged and --worktree
By default, files are restored from the index for --worktree, and from HEAD for --staged. When --worktree and --staged are combined, --source must be specified to disambiguate the restore source[1], thus making it cumbersome to restore a file in both the worktree and the index. However, HEAD is also a reasonable default for --worktree when combined with --staged, so make it the default anytime --staged is used (whether combined with --worktree or not). [1]: Due to an oversight, the --source requirement, though documented, is not actually enforced. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Reviewed-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t2070-restore.sh11
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t2070-restore.sh b/t/t2070-restore.sh
index 076d0df..89e5a14 100755
--- a/t/t2070-restore.sh
+++ b/t/t2070-restore.sh
@@ -69,6 +69,17 @@ test_expect_success 'restore --staged uses HEAD as source' '
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' '
git init unmerged &&
(