blob 828d1a355bef4d9b0107b6962c303d7fc59d1f6d 836 bytes (raw)
name: t/t4131-apply-fake-ancestor.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
| | #!/bin/sh
#
# Copyright (c) 2009 Stephen Boyd
#
test_description='git apply --build-fake-ancestor handling.'
. ./test-lib.sh
test_expect_success 'setup' '
test_commit 1 &&
test_commit 2 &&
mkdir sub &&
test_commit 3 sub/3.t &&
test_commit 4
'
test_expect_success 'apply --build-fake-ancestor' '
git checkout 2 &&
echo "A" >1.t &&
git diff >1.patch &&
git reset --hard &&
git checkout 1 &&
git apply --build-fake-ancestor 1.ancestor 1.patch
'
test_expect_success 'apply --build-fake-ancestor in a subdirectory' '
git checkout 3 &&
echo "C" >sub/3.t &&
git diff >3.patch &&
git reset --hard &&
git checkout 4 &&
(
cd sub &&
git apply --build-fake-ancestor 3.ancestor ../3.patch &&
test -f 3.ancestor
) &&
git apply --build-fake-ancestor 3.ancestor 3.patch &&
test_cmp sub/3.ancestor 3.ancestor
'
test_done
|
debug log:
solving 828d1a355b ...
found 828d1a355b in https://public-inbox.org/git/20200319132957.17813-2-harshitjain1371999@gmail.com/ ||
https://public-inbox.org/git/20200320130845.23257-2-harshitjain1371999@gmail.com/
found b1361ce546 in https://80x24.org/mirrors/git.git
preparing index
index prepared:
100755 b1361ce54693a07486f5837b0fe477f828b80a4e t/t4131-apply-fake-ancestor.sh
applying [1/1] https://public-inbox.org/git/20200319132957.17813-2-harshitjain1371999@gmail.com/
diff --git a/t/t4131-apply-fake-ancestor.sh b/t/t4131-apply-fake-ancestor.sh
index b1361ce546..828d1a355b 100755
Checking patch t/t4131-apply-fake-ancestor.sh...
Applied patch t/t4131-apply-fake-ancestor.sh cleanly.
skipping https://public-inbox.org/git/20200320130845.23257-2-harshitjain1371999@gmail.com/ for 828d1a355b
index at:
100755 828d1a355bef4d9b0107b6962c303d7fc59d1f6d t/t4131-apply-fake-ancestor.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).