merge(3p/git): Merge git upstream at v2.26.2
This commit is contained in:
commit
5229c9b232
1006 changed files with 149006 additions and 60819 deletions
27
third_party/git/t/t3908-stash-in-worktree.sh
vendored
Executable file
27
third_party/git/t/t3908-stash-in-worktree.sh
vendored
Executable file
|
@ -0,0 +1,27 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2019 Johannes E Schindelin
|
||||
#
|
||||
|
||||
test_description='Test git stash in a worktree'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
test_expect_success 'setup' '
|
||||
test_commit initial &&
|
||||
git worktree add wt &&
|
||||
test_commit -C wt in-worktree
|
||||
'
|
||||
|
||||
test_expect_success 'apply in subdirectory' '
|
||||
mkdir wt/subdir &&
|
||||
(
|
||||
cd wt/subdir &&
|
||||
echo modified >../initial.t &&
|
||||
git stash &&
|
||||
git stash apply >out
|
||||
) &&
|
||||
grep "\.\.\/initial\.t" wt/subdir/out
|
||||
'
|
||||
|
||||
test_done
|
Loading…
Add table
Add a link
Reference in a new issue