git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / Atom feed
e63040932f4079dd4ccee60793d16f7ec7e5da49 blob 1366 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
 
#!/bin/sh
#
# Copyright (c) 2019 Denton Liu
#

test_description='git rebase --fork-point test'

. ./test-lib.sh

# A---B---D---E       (master)
#     \
#      C*---F---G (side)
#
# C was formerly part of master but master was rewound to remove C
#
test_expect_success setup '
	test_commit A &&
	test_commit B &&
	test_commit C &&
	git branch -t side &&
	git reset --hard HEAD^ &&
	test_commit D &&
	test_commit E &&
	git checkout side &&
	test_commit F &&
	test_commit G
'

test_rebase() {
	expected="$1" &&
	shift &&
	test_expect_success "git rebase $*" "
		git checkout master &&
		git reset --hard E &&
		git checkout side &&
		git reset --hard G &&
		git rebase $* &&
		test_write_lines $expected >expect &&
		git log --pretty=%s >actual &&
		test_cmp expect actual
	"
}

test_rebase 'G F E D B A'
test_rebase 'G F D B A' --onto D
test_rebase 'G F B A' --keep-base
test_rebase 'G F C E D B A' --no-fork-point
test_rebase 'G F C D B A' --no-fork-point --onto D
test_rebase 'G F C B A' --no-fork-point --keep-base
test_rebase 'G F E D B A' --fork-point refs/heads/master
test_rebase 'G F D B A' --fork-point --onto D refs/heads/master
test_rebase 'G F B A' --fork-point --keep-base refs/heads/master
test_rebase 'G F C E D B A' refs/heads/master
test_rebase 'G F C D B A' --onto D refs/heads/master
test_rebase 'G F C B A' --keep-base refs/heads/master

test_done
debug log:

solving e63040932f ...
found e63040932f in https://public-inbox.org/git/cover.1554500051.git.liu.denton@gmail.com/
	https://public-inbox.org/git/6635a99edebee43273ee47bbebe13dfe539fc69c.1554500051.git.liu.denton@gmail.com/
	https://public-inbox.org/git/d6e7e1ca4b8d9c644181adef6ab1e4be77722b99.1555366891.git.liu.denton@gmail.com/
found 0311bcbc68 in https://public-inbox.org/git/d0cde21c3049c76bf8f6057d6f92796479bedcff.1554151449.git.liu.denton@gmail.com/
found 8e2483b73e in https://public-inbox.org/git/234ac9f024bf4e6b4944fd8f3912cf6367cf828b.1554151449.git.liu.denton@gmail.com/

applying [1/5] https://public-inbox.org/git/234ac9f024bf4e6b4944fd8f3912cf6367cf828b.1554151449.git.liu.denton@gmail.com/
diff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh
new file mode 100755
index 0000000000..8e2483b73e


applying [2/5] https://public-inbox.org/git/d0cde21c3049c76bf8f6057d6f92796479bedcff.1554151449.git.liu.denton@gmail.com/
diff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh
index 8e2483b73e..0311bcbc68 100755


applying [3/5] https://public-inbox.org/git/cover.1554500051.git.liu.denton@gmail.com/
diff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh
index 0311bcbc68..e63040932f 100755

Checking patch t/t3431-rebase-fork-point.sh...
Applied patch t/t3431-rebase-fork-point.sh cleanly.
Checking patch t/t3431-rebase-fork-point.sh...
Applied patch t/t3431-rebase-fork-point.sh cleanly.
Checking patch t/t3431-rebase-fork-point.sh...
Applied patch t/t3431-rebase-fork-point.sh cleanly.

skipping https://public-inbox.org/git/6635a99edebee43273ee47bbebe13dfe539fc69c.1554500051.git.liu.denton@gmail.com/ for e63040932f
skipping https://public-inbox.org/git/d6e7e1ca4b8d9c644181adef6ab1e4be77722b99.1555366891.git.liu.denton@gmail.com/ for e63040932f
index at:
100755 e63040932f4079dd4ccee60793d16f7ec7e5da49	t/t3431-rebase-fork-point.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.org/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