blob a98cfe18b70008cf397f1740180dc3a311780401 2527 bytes (raw)
name: t/t3433-rebase-options-compatibility.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
89
90
91
92
93
94
95
96
97
98
99
100
101
102
| | #!/bin/sh
#
# Copyright (c) 2019 Rohit Ashiwal
#
test_description='tests to ensure compatibility between am and interactive backends'
. ./test-lib.sh
GIT_AUTHOR_DATE="1999-04-02T08:03:20+05:30"
export GIT_AUTHOR_DATE
# This is a special case in which both am and interactive backends
# provide the same output. It was done intentionally because
# both the backends fall short of optimal behaviour.
test_expect_success 'setup' '
git checkout -b topic &&
q_to_tab >file <<-\EOF &&
line 1
Qline 2
line 3
EOF
git add file &&
git commit -m "add file" &&
cat >file <<-\EOF &&
line 1
new line 2
line 3
EOF
git commit -am "update file" &&
git tag side &&
test_commit commit1 foo foo1 &&
test_commit commit2 foo foo2 &&
test_commit commit3 foo foo3 &&
git checkout --orphan master &&
git rm --cached foo &&
rm foo &&
sed -e "s/^|//" >file <<-\EOF &&
|line 1
| line 2
|line 3
EOF
git add file &&
git commit -m "add file" &&
git tag main
'
test_expect_success '--ignore-whitespace works with am backend' '
cat >expect <<-\EOF &&
line 1
new line 2
line 3
EOF
test_must_fail git rebase main side &&
git rebase --abort &&
git rebase --ignore-whitespace main side &&
test_cmp expect file
'
test_expect_success '--ignore-whitespace works with interactive backend' '
cat >expect <<-\EOF &&
line 1
new line 2
line 3
EOF
test_must_fail git rebase --merge main side &&
git rebase --abort &&
git rebase --merge --ignore-whitespace main side &&
test_cmp expect file
'
test_expect_success '--committer-date-is-author-date works with am backend' '
git commit --amend &&
git rebase --committer-date-is-author-date HEAD^ &&
git show HEAD --pretty="format:%ai" >authortime &&
git show HEAD --pretty="format:%ci" >committertime &&
test_cmp authortime committertime
'
test_expect_success '--committer-date-is-author-date works with interactive backend' '
git commit --amend &&
git rebase -i --committer-date-is-author-date HEAD^ &&
git show HEAD --pretty="format:%ai" >authortime &&
git show HEAD --pretty="format:%ci" >committertime &&
test_cmp authortime committertime
'
test_expect_success '--committer-date-is-author-date works with rebase -r' '
git checkout side &&
git merge --no-ff commit3 &&
git rebase -r --root --committer-date-is-author-date &&
git rev-list HEAD >rev_list &&
while read HASH
do
git show $HASH --pretty="format:%ai" >authortime
git show $HASH --pretty="format:%ci" >committertime
test_cmp authortime committertime
done <rev_list
'
test_done
|
debug log:
solving a98cfe18b7 ...
found a98cfe18b7 in https://80x24.org/mirrors/git.git
(*) 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).