git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
blob 25c31b0cb1beb2c35f79d3b849b37c3ad900766c 1728 bytes (raw)
name: t/t4023-diff-rename-typechange.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
80
81
82
83
84
85
86
87
88
 
#!/bin/sh

test_description='typechange rename detection'

. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff.sh

test_expect_success setup '

	rm -f foo bar &&
	COPYING_test_data >foo &&
	test_ln_s_add linklink bar &&
	git add foo &&
	git commit -a -m Initial &&
	git tag one &&

	git rm -f foo bar &&
	COPYING_test_data >bar &&
	test_ln_s_add linklink foo &&
	git add bar &&
	git commit -a -m Second &&
	git tag two &&

	git rm -f foo bar &&
	COPYING_test_data >foo &&
	git add foo &&
	git commit -a -m Third &&
	git tag three &&

	mv foo bar &&
	test_ln_s_add linklink foo &&
	git add bar &&
	git commit -a -m Fourth &&
	git tag four &&

	# This is purely for sanity check

	git rm -f foo bar &&
	COPYING_test_data >foo &&
	cat "$TEST_DIRECTORY"/../Makefile >bar &&
	git add foo bar &&
	git commit -a -m Fifth &&
	git tag five &&

	git rm -f foo bar &&
	cat "$TEST_DIRECTORY"/../Makefile >foo &&
	COPYING_test_data >bar &&
	git add foo bar &&
	git commit -a -m Sixth &&
	git tag six

'

test_expect_success 'cross renames to be detected for regular files' '
	git diff-tree five six -r --name-status -B -M >out &&
	sort <out >actual &&
	{
		echo "R100	foo	bar" &&
		echo "R100	bar	foo"
	} | sort >expect &&
	test_cmp expect actual

'

test_expect_success 'cross renames to be detected for typechange' '
	git diff-tree one two -r --name-status -B -M >out &&
	sort <out >actual &&
	{
		echo "R100	foo	bar" &&
		echo "R100	bar	foo"
	} | sort >expect &&
	test_cmp expect actual

'

test_expect_success 'moves and renames' '
	git diff-tree three four -r --name-status -B -M >out &&
	sort <out >actual &&
	{
		# see -B -M (#6) in t4008
		echo "C100	foo	bar" &&
		echo "T100	foo"
	} | sort >expect &&
	test_cmp expect actual

'

test_done

debug log:

solving 25c31b0cb1b ...
found 25c31b0cb1b in https://public-inbox.org/git/patch-1.6-f8a382841d5-20220721T064349Z-avarab@gmail.com/ ||
	https://public-inbox.org/git/patch-v2-3.8-c5feef1c808-20221202T000227Z-avarab@gmail.com/ ||
	https://public-inbox.org/git/patch-v3-3.8-4ec075689f6-20221202T114733Z-avarab@gmail.com/
found 7cb99092938 in https://80x24.org/mirrors/git.git
preparing index
index prepared:
100755 7cb99092938d7dd64e8ab6f4e147fc5f70c0a310	t/t4023-diff-rename-typechange.sh

applying [1/1] https://public-inbox.org/git/patch-1.6-f8a382841d5-20220721T064349Z-avarab@gmail.com/
diff --git a/t/t4023-diff-rename-typechange.sh b/t/t4023-diff-rename-typechange.sh
index 7cb99092938..25c31b0cb1b 100755

Checking patch t/t4023-diff-rename-typechange.sh...
Applied patch t/t4023-diff-rename-typechange.sh cleanly.

skipping https://public-inbox.org/git/patch-v2-3.8-c5feef1c808-20221202T000227Z-avarab@gmail.com/ for 25c31b0cb1b
skipping https://public-inbox.org/git/patch-v3-3.8-4ec075689f6-20221202T114733Z-avarab@gmail.com/ for 25c31b0cb1b
index at:
100755 25c31b0cb1beb2c35f79d3b849b37c3ad900766c	t/t4023-diff-rename-typechange.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).