blob 6ed40b15755502ecec8e5ee5e566007519111a3c 1702 bytes (raw)
name: t/t7607-merge-overwrite.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
78
79
| | #!/bin/sh
test_description='git-merge
Do not overwrite changes.'
. ./test-lib.sh
test_expect_success 'setup' '
test_commit c0 &&
test_commit c1 &&
test_commit "c1a" "c1.t" "c1 a" &&
git reset --hard c0 &&
test_commit c2 &&
echo "VERY IMPORTANT CHANGES" > important
'
test_expect_success 'will not overwrite untracked file' '
git reset --hard c1 &&
cp important c2.t &&
test_must_fail git merge c2 &&
! test -f .git/MERGE_HEAD &&
test_cmp important c2.t
'
test_expect_success 'will not overwrite new file' '
git reset --hard c1 &&
cp important c2.t &&
git add c2.t &&
test_must_fail git merge c2 &&
! test -f .git/MERGE_HEAD &&
test_cmp important c2.t
'
test_expect_success 'will not overwrite staged changes' '
git reset --hard c1 &&
cp important c2.t &&
git add c2.t &&
rm c2.t &&
test_must_fail git merge c2 &&
! test -f .git/MERGE_HEAD &&
git checkout c2.t &&
test_cmp important c2.t
'
test_expect_success 'will not overwrite removed file' '
git reset --hard c1 &&
git rm c1.t &&
git commit -m "rm c1.t" &&
cp important c1.t &&
test_must_fail git merge c1a &&
test_cmp important c1.t
'
test_expect_success 'will not overwrite re-added file' '
git reset --hard c1 &&
git rm c1.t &&
git commit -m "rm c1.t" &&
cp important c1.t &&
git add c1.t &&
test_must_fail git merge c1a &&
! test -f .git/MERGE_HEAD &&
test_cmp important c1.t
'
test_expect_success 'will not overwrite removed file with staged changes' '
git reset --hard c1 &&
git rm c1.t &&
git commit -m "rm c1.t" &&
cp important c1.t &&
git add c1.t &&
rm c1.t &&
test_must_fail git merge c1a &&
! test -f .git/MERGE_HEAD &&
git checkout c1.t &&
test_cmp important c1.t
'
test_done
|
debug log:
solving 6ed40b1 ...
found 6ed40b1 in https://public-inbox.org/git/1286632380-7002-2-git-send-email-drizzd@aon.at/
found d82349a in https://80x24.org/mirrors/git.git
preparing index
index prepared:
100755 d82349a6a8d6c12c3ca4398a18bd6c1dd42efdc9 t/t7607-merge-overwrite.sh
applying [1/1] https://public-inbox.org/git/1286632380-7002-2-git-send-email-drizzd@aon.at/
diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh
index d82349a..6ed40b1 100755
Checking patch t/t7607-merge-overwrite.sh...
Applied patch t/t7607-merge-overwrite.sh cleanly.
index at:
100755 6ed40b15755502ecec8e5ee5e566007519111a3c t/t7607-merge-overwrite.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).