repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
remote: clear string_list after use in mv()
2018-06-13
Elijah Newren
RelN
o
tes 2
.
18: clarify
w
here directory rename detec
t
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah Newren
R
e
lNote
s
:
remove dup
l
ica
t
e
release not
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elijah Newren
rev-p
a
rse: check lookup'ed
c
om
m
it references
for NU
L
L
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah Newre
n
merge-recursive
:
provide p
a
ir of `unp
a
ck_trees_{s
t
art
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
a
h
Newren
m
erge-recursiv
e
:
f
ix check
f
o
r
s
kipabili
t
y of working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
N
e
w
r
en
merge-recursive: make "Auto-
m
erging" commen
t
show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-
r
ecurs
i
ve: f
i
x remain
d
er of was_dirty(
)
to use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ew
r
en
m
erge
-
recursive: fix
w
as_tracked() to quit lying with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
t
6
046: testcases
checki
n
g whether updates can be skipped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive:
avoi
d
tr
i
ggering add_cachein
f
o error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
merge-recursive: mov
e
more is_d
i
rty handl
i
ng to merge_c
o
ntent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
me
r
ge-recursive: improve add_
c
ache
i
nfo error h
a
ndling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah
N
ewren
merge-recursive: avoid
spurious r
e
n
ame/r
e
name
conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
d
i
rectory rename detection: new
t
e
s
tcases show
c
asing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Ne
w
ren
merge-recursive: fi
x
remaining directory r
e
name + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah
N
ewren
mer
g
e-recurs
i
ve:
f
ix ove
r
writing dir
t
y files involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
m
e
rge
-
r
ecursive
:
avoid clob
b
ering
un
t
racked fil
e
s
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Ne
w
r
e
n
merge-r
e
cursive: apply necess
a
ry modifications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
mer
g
e
-
recursive: when comparing
files, d
o
n
'
t include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah New
r
en
m
erge-recursive: check for file l
e
vel conf
l
i
c
ts th
e
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newren
merge-re
c
ursive: ad
d
computation of co
l
l
i
s
ions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
me
r
ge-recursi
v
e: chec
k
for directory
l
evel
conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h New
r
en
merge-recur
s
i
v
e: add get_direct
o
ry_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elijah Newr
e
n
unpack_
t
rees: fix
b
r
eakage w
h
e
n
o->s
r
c_
i
nde
x
!= o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Elijah Newren
M
ake ru
n
n
i
ng git under other debugger-l
i
ke progra
m
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lij
a
h Newr
e
n
merge-recursive:
m
ake a helpe
r
function
f
or cle
a
nup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
merge-recurs
i
v
e: split ou
t
code f
o
r
determining diff_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
merge-recurs
i
v
e
: ma
k
e !
o
->detect_rename
codepa
t
h more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
mer
g
e-recursive:
f
ix leaks of allo
c
ated rena
m
es and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
ja
h
N
e
wr
e
n
m
er
g
e-r
e
c
u
rsiv
e
: introduce ne
w
fun
c
tions t
o
handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newren
merge-recursive: move
the
g
e
t
_renames() function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
dir
e
cto
r
y rename detection
:
tests f
o
r handling
overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory re
n
ame
d
etection: tests for h
a
n
d
ling overwr
i
ting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h
Ne
w
ren
dire
c
tory
r
e
nam
e
detecti
o
n: miscellaneous testcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory
rename de
t
ection: testca
s
es explor
i
ng
possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
direc
t
ory rename detec
t
ion
:
more involved e
d
g
e
/cor
n
er
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory r
e
name detection: testca
s
es
c
hecking
w
hi
c
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newren
directory rename
d
etection: files/directori
e
s
in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
directory renam
e
detection: p
a
rtiall
y
renamed di
r
e
cto
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
direct
o
ry
re
n
ame detection: tes
t
cases
t
o
a
void taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory ren
a
me det
e
ctio
n
: d
i
rectory splitti
n
g te
s
tcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
r
en
d
i
rectory
r
ename detection: basic testcas
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah
N
ewren
Documen
t
a
t
i
o
n: normaliz
e
spelling of 'normalised'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newren
Documentatio
n
: fix several one-character
-
o
f
f spelling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ijah New
r
en
m
e
rge-re
c
ursive: ensur
e
we
w
rite updat
e
s for di
r
ectory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
El
i
jah Newren
m
e
r
ge-r
e
cursive: avoid
spu
r
i
o
u
s
ren
a
m
e/rename conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
directory ren
a
me detection: ne
w
te
s
tc
a
ses
s
howcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newre
n
mer
g
e-recur
s
ive: fix remaining di
r
e
ctory rename + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-
r
e
c
ursive: f
i
x overwriting dirt
y
file
s
involve
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
m
e
rge-recursive: avoid clobbering un
t
racked files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ijah Ne
w
ren
merge-recursiv
e
: apply
n
ece
s
s
a
ry modifications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
merge-recurs
i
v
e
: when comparing files, don't inc
l
u
de
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
erge-recursive: check for file level con
f
licts th
e
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
merg
e
-re
c
urs
i
ve
:
add
computatio
n
of collisions
due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah
N
ewren
m
erge-recursiv
e
: check
for direc
t
o
r
y level conf
l
icts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recu
r
sive: add get_director
y
_
ren
a
m
es()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
e
r
g
e-recursive:
make a helper f
u
nct
i
o
n for cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ij
a
h Newren
merge-rec
u
rsive: split
out code for de
t
erm
i
nin
g
d
iff_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
me
r
ge
-
rec
u
rsive: make
!o->detect_rename codepa
t
h more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
merge
-
recurs
i
ve
:
fix leaks o
f
allocated renames and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
erge-recu
r
sive:
i
ntro
d
uce new fun
c
tions to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
m
e
rge-
r
ec
u
r
sive
:
move the get_renames() func
t
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah
Newren
dire
c
tory
r
e
name
d
etection
:
test
s
for ha
n
dling overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Newren
directory
r
enam
e
de
t
ection:
t
ests for handling
o
v
erwr
i
ting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ij
a
h Newren
directory rename d
e
te
c
ti
o
n: miscellane
o
us testcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newren
d
ir
e
ctory rename d
e
tection: testca
s
es explorin
g
pos
s
ibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
directory
rename detec
t
ion: mo
r
e in
v
olved edge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah
N
ewre
n
director
y
rena
m
e detection
:
testcases checki
n
g
w
hich
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lij
a
h New
r
en
d
ire
c
tory r
e
n
a
me detection: fi
l
es/director
i
es in
t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename det
e
ction:
par
t
ially renamed d
i
recto
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah New
r
en
direct
o
ry renam
e
d
etection: testcases to avoid takin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
j
ah Newren
direct
o
ry rename
d
etect
i
o
n
: direct
o
ry split
t
ing te
s
tcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
dir
e
ctory renam
e
det
e
c
ti
o
n: basic test
c
as
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
me
r
ge-recur
s
ive: add explanati
o
n
f
o
r
s
rc_entry and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
E
lijah Ne
w
ren
me
r
ge-recur
s
ive: fix logic ord
e
ring
issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
Tigh
t
en a
n
d corr
e
ct a few testcases
fo
r
m
e
rging and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newre
n
merge-
r
e
cu
r
sive: avoid incorpor
a
ting
unc
o
mmitted change
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Eli
j
ah
N
ew
r
en
mo
v
e index_has_
c
h
an
g
es() from bui
l
tin/am
.
c to m
e
rge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
El
i
j
a
h N
e
w
ren
t604
4
:
recursive can silently incorpor
a
te di
r
ty
changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
E
lijah Newr
e
n
strbuf:
r
emove u
n
u
s
ed stripspace
function alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
El
i
jah
N
ewren
merge
-
recursive: ignore_case
s
hou
l
dn't rejec
t
intentional
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elij
a
h
Newren
s
e
quencer: show rename progress duri
n
g cherr
y
picks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
diff: remove si
l
ent
cl
a
m
p
o
f
re
n
ameLimit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
lijah
N
ewren
pro
g
res
s
: fix progr
e
ss meter
s
w
hen dealing wi
t
h l
o
ts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
merge
-
r
ecursive: ha
n
dle additi
o
n of subm
o
dule on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah N
e
wren
sequence
r
:
warn when
internal merge may be s
u
boptimal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
t6044: new
merge testcases for w
h
en in
d
ex
doesn't match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newr
e
n
m
e
rge-octopu
s
: a
b
ort if i
n
dex does
n
ot match H
E
AD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Eli
j
ah Newr
e
n
built
i
n/merge
.
c
:
f
i
x a bug with trivial merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elij
a
h
N
ewren
t
7
605: ad
d
a t
e
s
t
case demonstrat
i
ng a bug w
i
th trivi
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newre
n
merge-recursive: d
o
not check working copy wh
e
n creatin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
me
r
ge-recu
r
s
ive: remove duplic
a
te code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
ja
h
Newren
merge-
r
ec
u
rsive: Don't re-
s
ort a list who
s
e order we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
ja
h
Newren
merge-recurs
i
ve: Fix v
i
rtual merge base
f
or rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t
603
6
: cris
s
-cross + rename/rename(1to2)/add-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah N
e
wren
merge-rec
u
rsive: Avo
i
d unnece
s
s
a
ry file rewrit
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h Newren
t6022: A
d
d
ition
a
l
t
e
s
t
s checking for unnece
s
sary updat
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-recursive: Fix sp
u
rious '
r
efus
i
ng
to
l
ose untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t60
2
2: Add testcase for spurious "refusing to lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
merge-recursive: Fix
working copy h
a
ndli
n
g
f
o
r
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next