git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / Atom feed
1cb2896fb4d677b85841bad9ba53372846b2af84 blob 2094 bytes (raw)

 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
 
#!/bin/sh
#
# Copyright (c) 2019 Denton Liu
#

test_description='ensure rebase fast-forwards commits when possible'

. ./test-lib.sh

test_expect_success setup '
	test_commit A &&
	test_commit B &&
	test_commit C &&
	test_commit D &&
	git checkout -t -b side
'

test_rebase_same_head() {
	status="$1" &&
	shift &&
	test_expect_$status "git rebase $* with $changes is no-op" "
		oldhead=\$(git rev-parse HEAD) &&
		test_when_finished 'git reset --hard \$oldhead' &&
		git rebase $* &&
		newhead=\$(git rev-parse HEAD) &&
		test_cmp_rev \$oldhead \$newhead
	"
}

changes='no changes'
test_rebase_same_head success
test_rebase_same_head success master
test_rebase_same_head success --onto B B
test_rebase_same_head success --onto B... B
test_rebase_same_head success --onto master... master
test_rebase_same_head success --no-fork-point
test_rebase_same_head success --fork-point master
test_rebase_same_head success --fork-point --onto B B
test_rebase_same_head success --fork-point --onto B... B
test_rebase_same_head success --fork-point --onto master... master

test_expect_success 'add work to side' '
	test_commit E
'

changes='our changes'
test_rebase_same_head success
test_rebase_same_head success master
test_rebase_same_head success --onto B B
test_rebase_same_head success --onto B... B
test_rebase_same_head success --onto master... master
test_rebase_same_head success --no-fork-point
test_rebase_same_head success --fork-point master
test_rebase_same_head success --fork-point --onto B B
test_rebase_same_head success --fork-point --onto B... B
test_rebase_same_head success --fork-point --onto master... master

test_expect_success 'add work to upstream' '
	git checkout master &&
	test_commit F &&
	git checkout side
'

changes='our and their changes'
test_rebase_same_head success --onto B B
test_rebase_same_head success --onto B... B
test_rebase_same_head success --onto master... master
test_rebase_same_head success --fork-point --onto B B
test_rebase_same_head success --fork-point --onto B... B
test_rebase_same_head success --fork-point --onto master... master

test_done
debug log:

solving 1cb2896fb4 ...
found 1cb2896fb4 in https://public-inbox.org/git/2256a902c17fb70ddedeb65f5d0395c5767800f2.1555366891.git.liu.denton@gmail.com/ ||
	https://public-inbox.org/git/8254730810eed7b413baebe918efb43e26e04af8.1555832783.git.liu.denton@gmail.com/ ||
	https://public-inbox.org/git/0a466e830f7704f3ae75691db535946a3d57ddc9.1555523176.git.liu.denton@gmail.com/
found d0e5b1f3e6 in https://public-inbox.org/git/2559ab54a2c6e5544595e0d66a431e249bf73ca8.1555523176.git.liu.denton@gmail.com/ ||
	https://public-inbox.org/git/27cbcfaeae91b9abe2726995b5f26d23892cb7ec.1555832783.git.liu.denton@gmail.com/ ||
	https://public-inbox.org/git/ec55da07191e7f0a1d31342053c1496405ba7d3a.1555366891.git.liu.denton@gmail.com/
found 4f04d67fd7 in https://public-inbox.org/git/4c087ec0413880e1d3e6cbba95ff62224a4d95e6.1555832783.git.liu.denton@gmail.com/ ||
	https://public-inbox.org/git/4c087ec0413880e1d3e6cbba95ff62224a4d95e6.1555523176.git.liu.denton@gmail.com/ ||
	https://public-inbox.org/git/148027a14be9b0ee5dde741e4528255f2ca3577a.1555366891.git.liu.denton@gmail.com/

applying [1/9] https://public-inbox.org/git/4c087ec0413880e1d3e6cbba95ff62224a4d95e6.1555832783.git.liu.denton@gmail.com/
diff --git a/t/t3432-rebase-fast-forward.sh b/t/t3432-rebase-fast-forward.sh
new file mode 100755
index 0000000000..4f04d67fd7

Checking patch t/t3432-rebase-fast-forward.sh...
Applied patch t/t3432-rebase-fast-forward.sh cleanly.

skipping https://public-inbox.org/git/4c087ec0413880e1d3e6cbba95ff62224a4d95e6.1555523176.git.liu.denton@gmail.com/ for 4f04d67fd7
skipping https://public-inbox.org/git/148027a14be9b0ee5dde741e4528255f2ca3577a.1555366891.git.liu.denton@gmail.com/ for 4f04d67fd7
index at:
100755 4f04d67fd7894760f272a5937fced2fa52f0e1e0	t/t3432-rebase-fast-forward.sh

applying [2/9] https://public-inbox.org/git/2559ab54a2c6e5544595e0d66a431e249bf73ca8.1555523176.git.liu.denton@gmail.com/
diff --git a/t/t3432-rebase-fast-forward.sh b/t/t3432-rebase-fast-forward.sh
index 4f04d67fd7..d0e5b1f3e6 100755

Checking patch t/t3432-rebase-fast-forward.sh...
Applied patch t/t3432-rebase-fast-forward.sh cleanly.

skipping https://public-inbox.org/git/27cbcfaeae91b9abe2726995b5f26d23892cb7ec.1555832783.git.liu.denton@gmail.com/ for d0e5b1f3e6
skipping https://public-inbox.org/git/ec55da07191e7f0a1d31342053c1496405ba7d3a.1555366891.git.liu.denton@gmail.com/ for d0e5b1f3e6
index at:
100755 d0e5b1f3e6fe8e21b47bcef2aeb8ee6c458e106a	t/t3432-rebase-fast-forward.sh

applying [3/9] https://public-inbox.org/git/2256a902c17fb70ddedeb65f5d0395c5767800f2.1555366891.git.liu.denton@gmail.com/
diff --git a/t/t3432-rebase-fast-forward.sh b/t/t3432-rebase-fast-forward.sh
index d0e5b1f3e6..1cb2896fb4 100755

Checking patch t/t3432-rebase-fast-forward.sh...
Applied patch t/t3432-rebase-fast-forward.sh cleanly.

skipping https://public-inbox.org/git/8254730810eed7b413baebe918efb43e26e04af8.1555832783.git.liu.denton@gmail.com/ for 1cb2896fb4
skipping https://public-inbox.org/git/0a466e830f7704f3ae75691db535946a3d57ddc9.1555523176.git.liu.denton@gmail.com/ for 1cb2896fb4
index at:
100755 1cb2896fb4d677b85841bad9ba53372846b2af84	t/t3432-rebase-fast-forward.sh

git@vger.kernel.org list mirror (unofficial, one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git