diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/t/t3908-stash-in-worktree.sh | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/t/t3908-stash-in-worktree.sh')
| -rwxr-xr-x | third_party/git/t/t3908-stash-in-worktree.sh | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/third_party/git/t/t3908-stash-in-worktree.sh b/third_party/git/t/t3908-stash-in-worktree.sh deleted file mode 100755 index 2b2b366ef94b..000000000000 --- a/third_party/git/t/t3908-stash-in-worktree.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/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 |