projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] git-tar-tree: fix write_trailer
[git.git]
/
t
/
t1000-read-tree-m-3way.sh
diff --git
a/t/t1000-read-tree-m-3way.sh
b/t/t1000-read-tree-m-3way.sh
index
bd7406f
..
72bc122
100755
(executable)
--- a/
t/t1000-read-tree-m-3way.sh
+++ b/
t/t1000-read-tree-m-3way.sh
@@
-81,60
+81,60
@@
test_expect_success \
'3-way merge with git-read-tree -m' \
"git-read-tree -m $tree_O $tree_A $tree_B"
'3-way merge with git-read-tree -m' \
"git-read-tree -m $tree_O $tree_A $tree_B"
-
strip_object_id='s/^\([0-7]*\) [0-9a-f]* \([0-3].*\)$/\1 \2/
'
-
+
_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]
'
+_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
test_expect_success \
'git-ls-files --stage of the merge result' \
'git-ls-files --stage >current- &&
test_expect_success \
'git-ls-files --stage of the merge result' \
'git-ls-files --stage >current- &&
- sed -e "
$strip_object_id
" <current- >current'
+ sed -e "
s/ $_x40 / X /
" <current- >current'
cat >expected <<\EOF
cat >expected <<\EOF
-100644
2
AA
-100644
3
AA
-100644
2
AN
-100644
1
DD
-100644
3
DF
-100644
2
DF/DF
-100644
1
DM
-100644
3
DM
-100644
1
DN
-100644
3
DN
-100644
2
LL
-100644
3
LL
-100644
1
MD
-100644
2
MD
-100644
1
MM
-100644
2
MM
-100644
3
MM
-100644
0
MN
-100644
3
NA
-100644
1
ND
-100644
2
ND
-100644
0
NM
-100644
0
NN
-100644
0
SS
-100644
1
TT
-100644
2
TT
-100644
3
TT
-100644
2
Z/AA
-100644
3
Z/AA
-100644
2
Z/AN
-100644
1
Z/DD
-100644
1
Z/DM
-100644
3
Z/DM
-100644
1
Z/DN
-100644
3
Z/DN
-100644
1
Z/MD
-100644
2
Z/MD
-100644
1
Z/MM
-100644
2
Z/MM
-100644
3
Z/MM
-100644
0
Z/MN
-100644
3
Z/NA
-100644
1
Z/ND
-100644
2
Z/ND
-100644
0
Z/NM
-100644
0
Z/NN
+100644
X 2
AA
+100644
X 3
AA
+100644
X 2
AN
+100644
X 1
DD
+100644
X 3
DF
+100644
X 2
DF/DF
+100644
X 1
DM
+100644
X 3
DM
+100644
X 1
DN
+100644
X 3
DN
+100644
X 2
LL
+100644
X 3
LL
+100644
X 1
MD
+100644
X 2
MD
+100644
X 1
MM
+100644
X 2
MM
+100644
X 3
MM
+100644
X 0
MN
+100644
X 3
NA
+100644
X 1
ND
+100644
X 2
ND
+100644
X 0
NM
+100644
X 0
NN
+100644
X 0
SS
+100644
X 1
TT
+100644
X 2
TT
+100644
X 3
TT
+100644
X 2
Z/AA
+100644
X 3
Z/AA
+100644
X 2
Z/AN
+100644
X 1
Z/DD
+100644
X 1
Z/DM
+100644
X 3
Z/DM
+100644
X 1
Z/DN
+100644
X 3
Z/DN
+100644
X 1
Z/MD
+100644
X 2
Z/MD
+100644
X 1
Z/MM
+100644
X 2
Z/MM
+100644
X 3
Z/MM
+100644
X 0
Z/MN
+100644
X 3
Z/NA
+100644
X 1
Z/ND
+100644
X 2
Z/ND
+100644
X 0
Z/NM
+100644
X 0
Z/NN
EOF
test_expect_success \
EOF
test_expect_success \