maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Squashed 'third_party/git/' content from commit cb71568594

Browse source 
git-subtree-dir: third_party/git
git-subtree-split: cb715685942260375e1eb8153b0768a376e4ece7
This commit is contained in:
Vincent Ambo 2020-01-11 23:36:56 +00:00
commit 1b593e1ea4
3629 changed files with 1139935 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

19
t/t4252/am-test-1-1 Normal file
View file

@ -0,0 +1,19 @@
From: A U Thor <au.thor@example.com>
Date: Thu Dec 4 16:00:00 2008 -0800
Subject: Three
Application of this should be rejected because the first line in the
context does not match.
diff --git i/file-1 w/file-1
index 06e567b..10f8342 100644
--- i/file-1
+++ w/file-1
@@ -1,6 +1,6 @@
One
2
-3
+Three
4
5
6

21
t/t4252/am-test-1-2 Normal file
View file

@ -0,0 +1,21 @@
From: A U Thor <au.thor@example.com>
Date: Thu Dec 4 16:00:00 2008 -0800
Subject: Six
Applying this patch with --whitespace=fix should lose
the trailing whitespace after "Six".
diff --git i/file-2 w/file-2
index 06e567b..b6f3a16 100644
--- i/file-2
+++ w/file-2
@@ -1,7 +1,7 @@
1
2
-3
+Three
4
5
-6
+Six
7

19
t/t4252/am-test-2-1 Normal file
View file

@ -0,0 +1,19 @@
From: A U Thor <au.thor@example.com>
Date: Thu Dec 4 16:00:00 2008 -0800
Subject: Three
Application of this should be rejected even with -C1 because the
preimage line in the context does not match.
diff --git i/file-1 w/file-1
index 06e567b..10f8342 100644
--- i/file-1
+++ w/file-1
@@ -1,6 +1,6 @@
1
2
-Tres
+Three
4
5
6

21
t/t4252/am-test-2-2 Normal file
View file

@ -0,0 +1,21 @@
From: A U Thor <au.thor@example.com>
Date: Thu Dec 4 16:00:00 2008 -0800
Subject: Six
Applying this patch with -C1 should be successful even though
the first line in the context does not match.
diff --git i/file-2 w/file-2
index 06e567b..b6f3a16 100644
--- i/file-2
+++ w/file-2
@@ -1,7 +1,7 @@
One
2
-3
+Three
4
5
-6
+Six
7

19
t/t4252/am-test-3-1 Normal file
View file

@ -0,0 +1,19 @@
From: A U Thor <au.thor@example.com>
Date: Thu Dec 4 16:00:00 2008 -0800
Subject: Three
Application of this should be rejected even with -p2 because the
preimage line in the context does not match.
diff --git i/junk/file-1 w/junk/file-1
index 06e567b..10f8342 100644
--- i/junk/file-1
+++ w/junk/file-1
@@ -1,6 +1,6 @@
1
2
-Tres
+Three
4
5
6

21
t/t4252/am-test-3-2 Normal file
View file

@ -0,0 +1,21 @@
From: A U Thor <au.thor@example.com>
Date: Thu Dec 4 16:00:00 2008 -0800
Subject: Six
Applying this patch with -p2 should be successful even though
the patch is against a wrong level.
diff --git i/junk/file-2 w/junk/file-2
index 06e567b..b6f3a16 100644
--- i/junk/file-2
+++ w/junk/file-2
@@ -1,7 +1,7 @@
1
2
-3
+Three
4
5
-6
+Six
7

19
t/t4252/am-test-4-1 Normal file
View file

@ -0,0 +1,19 @@
From: A U Thor <au.thor@example.com>
Date: Thu Dec 4 16:00:00 2008 -0800
Subject: Three
Application of this should be rejected even with -C1 -p2 because
the preimage line in the context does not match.
diff --git i/junk/file-1 w/junk/file-1
index 06e567b..10f8342 100644
--- i/junk/file-1
+++ w/junk/file-1
@@ -1,6 +1,6 @@
1
2
-Tres
+Three
4
5
6

22
t/t4252/am-test-4-2 Normal file
View file

@ -0,0 +1,22 @@
From: A U Thor <au.thor@example.com>
Date: Thu Dec 4 16:00:00 2008 -0800
Subject: Six
Applying this patch with -C1 -p2 should be successful even though
the patch is against a wrong level and the first context line does
not match.
diff --git i/junk/file-2 w/junk/file-2
index 06e567b..b6f3a16 100644
--- i/junk/file-2
+++ w/junk/file-2
@@ -1,7 +1,7 @@
One
2
-3
+Three
4
5
-6
+Six
7

20
t/t4252/am-test-5-1 Normal file
View file

@ -0,0 +1,20 @@
From: A U Thor <au.thor@example.com>
Date: Thu Dec 4 16:00:00 2008 -0800
Subject: Six
Applying this patch with --directory='frotz nitfol' should fail
diff --git i/junk/file-2 w/junk/file-2
index 06e567b..b6f3a16 100644
--- i/junk/file-2
+++ w/junk/file-2
@@ -1,7 +1,7 @@
One
2
-3
+Three
4
5
-6
+Six
7

15
t/t4252/am-test-5-2 Normal file
View file

@ -0,0 +1,15 @@
From: A U Thor <au.thor@example.com>
Date: Thu Dec 4 16:00:00 2008 -0800
Subject: Six
Applying this patch with --directory='frotz nitfol' should succeed
diff --git i/file-5 w/file-5
new file mode 100644
index 000000..1d6ed9f
--- /dev/null
+++ w/file-5
@@ -0,0 +1,3 @@
+One
+two
+three

21
t/t4252/am-test-6-1 Normal file
View file

@ -0,0 +1,21 @@
From: A U Thor <au.thor@example.com>
Date: Thu Dec 4 16:00:00 2008 -0800
Subject: Huh
Should fail and leave rejects
diff --git i/file-2 w/file-2
index 06e567b..b6f3a16 100644
--- i/file-2
+++ w/file-2
@@ -1,3 +1,3 @@
-0
+One
2
3
@@ -4,4 +4,4 @@
4
5
-6
+Six
7

7
t/t4252/file-1-0 Normal file
View file

@ -0,0 +1,7 @@
1
2
3
4
5
6
7

7
t/t4252/file-2-0 Normal file
View file

@ -0,0 +1,7 @@
1
2
3
4
5
6
7