git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / Atom feed
f493ce64c49114d6653e3ae5ffaf6dd2d53de208 blob 1515 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
 
#!/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 --keep-base 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 --keep-base 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 --keep-base master

test_done
debug log:

solving f493ce64c4 ...
found f493ce64c4 in https://public-inbox.org/git/cover.1554500051.git.liu.denton@gmail.com/
found 8585c21c5c in https://public-inbox.org/git/d0cde21c3049c76bf8f6057d6f92796479bedcff.1554151449.git.liu.denton@gmail.com/
found 414b4216d6 in https://public-inbox.org/git/xmqqo95ptbxj.fsf@gitster-ct.c.googlers.com/
found 3e6362dd9c in https://public-inbox.org/git/4da2fe9b0429e10821e1cb96b79500c749fc31be.1554151449.git.liu.denton@gmail.com/

applying [1/4] https://public-inbox.org/git/4da2fe9b0429e10821e1cb96b79500c749fc31be.1554151449.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..3e6362dd9c


applying [2/4] https://public-inbox.org/git/xmqqo95ptbxj.fsf@gitster-ct.c.googlers.com/
diff --git a/t/t3432-rebase-fast-forward.sh b/t/t3432-rebase-fast-forward.sh
index 3e6362dd9c..414b4216d6 100755


applying [3/4] https://public-inbox.org/git/d0cde21c3049c76bf8f6057d6f92796479bedcff.1554151449.git.liu.denton@gmail.com/
diff --git a/t/t3432-rebase-fast-forward.sh b/t/t3432-rebase-fast-forward.sh
index 414b4216d6..8585c21c5c 100755


applying [4/4] https://public-inbox.org/git/cover.1554500051.git.liu.denton@gmail.com/
diff --git a/t/t3432-rebase-fast-forward.sh b/t/t3432-rebase-fast-forward.sh
index 8585c21c5c..f493ce64c4 100755

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

index at:
100755 f493ce64c49114d6653e3ae5ffaf6dd2d53de208	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

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