blob df91bf54bc06316deed03358d9b0230ba1610b18 2103 bytes (raw)
name: t/t2070-restore.sh # note: path name is non-authoritative(*)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
| | #!/bin/sh
test_description='restore basic functionality'
. ./test-lib.sh
test_expect_success 'setup' '
test_commit first &&
echo first-and-a-half >>first.t &&
git add first.t &&
test_commit second &&
echo one >one &&
echo two >two &&
echo untracked >untracked &&
echo ignored >ignored &&
echo /ignored >.gitignore &&
git add one two .gitignore &&
git update-ref refs/heads/one master
'
test_expect_success 'restore without pathspec is not ok' '
test_must_fail git restore &&
test_must_fail git restore --source=first
'
test_expect_success 'restore -p without pathspec is fine' '
echo q >cmd &&
git restore -p <cmd
'
test_expect_success 'restore a file, ignoring branch of same name' '
cat one >expected &&
echo dirty >>one &&
git restore one &&
test_cmp expected one
'
test_expect_success 'restore a file on worktree from another branch' '
test_when_finished git reset --hard &&
git cat-file blob first:./first.t >expected &&
git restore --source=first first.t &&
test_cmp expected first.t &&
git cat-file blob HEAD:./first.t >expected &&
git show :first.t >actual &&
test_cmp expected actual
'
test_expect_success 'restore a file in the index from another branch' '
test_when_finished git reset --hard &&
git cat-file blob first:./first.t >expected &&
git restore --source=first --index first.t &&
git show :first.t >actual &&
test_cmp expected actual &&
git cat-file blob HEAD:./first.t >expected &&
test_cmp expected first.t
'
test_expect_success 'restore a file in both the index and worktree from another branch' '
test_when_finished git reset --hard &&
git cat-file blob first:./first.t >expected &&
git restore --source=first --index --worktree first.t &&
git show :first.t >actual &&
test_cmp expected actual &&
test_cmp expected first.t
'
test_expect_success 'restore --index uses HEAD as source' '
test_when_finished git reset --hard &&
git cat-file blob :./first.t >expected &&
echo index-dirty >>first.t &&
git add first.t &&
git restore --index first.t &&
git cat-file blob :./first.t >actual &&
test_cmp expected actual
'
test_done
|
debug log:
solving df91bf54bc ...
found df91bf54bc in https://public-inbox.org/git/20190308101655.9767-10-pclouds@gmail.com/
applying [1/1] https://public-inbox.org/git/20190308101655.9767-10-pclouds@gmail.com/
diff --git a/t/t2070-restore.sh b/t/t2070-restore.sh
new file mode 100755
index 0000000000..df91bf54bc
Checking patch t/t2070-restore.sh...
Applied patch t/t2070-restore.sh cleanly.
index at:
100755 df91bf54bc06316deed03358d9b0230ba1610b18 t/t2070-restore.sh
(*) Git path names are given by the tree(s) the blob belongs to.
Blobs themselves have no identifier aside from the hash of its contents.^
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).