repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Revert "dir: update stale description of treat_directory()"
2021-05-12
E
l
ijah Newren
dir: introduce
r
eadd
i
r_ski
p
_dot_and_dotdot
(
) he
l
per
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
El
i
j
ah Newr
e
n
dir: trave
r
se into u
n
trac
k
ed
d
irectories if they may
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
E
lijah New
r
en
dir: avoid unnecessary traversal into i
g
no
r
ed directory
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
Eli
j
ah N
e
w
r
en
t300
1
, t7300
:
add testcase
showcasing m
i
ssed direct
o
ry
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
Elijah
N
e
wr
e
n
t
7300:
a
dd testcase showing unnecessary trave
r
s
a
l into
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
E
lijah
N
e
w
ren
ls-files
:
error o
u
t on -i unless -o or
-c are sp
e
cified
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
E
l
i
jah Newre
n
dir:
r
eport number
o
f visited directo
r
ies and paths
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
Elija
h
Newre
n
dir
:
convert t
r
ace
c
all
s
to trace
2
e
quiva
l
ents
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-04
Elijah Newren
Docum
e
n
tation/RelNotes: improve release n
o
te fo
r
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
Elijah N
e
w
ren
merge-ort: call
d
iffcore_rename()
d
ire
c
tly
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
Elij
a
h Newren
gitdiff
c
ore
d
oc: mention new prel
i
minary step
f
or renam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
E
lijah Newren
diffcore-rename: guide inexact rename detection b
a
sed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
Elij
a
h New
r
en
diffcore-rename
:
complete find_
b
ase
n
ame_match
e
s()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newre
n
diffcore-re
n
ame: compute basenames
of sour
c
e an
d
dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
E
l
ijah New
r
en
t4001: add a test
c
omparing basename similarity and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
El
i
jah Newren
diffcor
e
-ren
a
me: filter rename_s
r
c l
i
st wh
e
n p
o
ssib
l
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-12
Elijah
N
ewren
diffcore-rename
:
no point tr
y
ing
to find a matc
h
better
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-24
E
li
j
ah Newren
merg
e
-ort:
beg
i
n performan
c
e work; i
n
strument w
i
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-24
Elijah
N
ewren
merge-ort: igno
r
e the directory rename split
c
onf
l
i
c
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-24
E
l
i
j
ah Newren
merg
e
-
o
r
t:
f
i
x
massive leak
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elij
a
h Newre
n
merge-ort:
f
ix a dir
e
ctory rename
d
etection
b
ug
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah
Newre
n
merg
e
-ort: process_rena
m
es() now needs more defe
n
siveness
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
E
l
ijah Newren
m
e
rge-
o
rt: i
m
plem
e
nt apply
_
directory_rename
_
m
o
d
ifications()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
m
e
rge-ort
:
add a
n
ew toplevel_dir
f
i
e
l
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
m
erge-ort:
implem
e
n
t handl
e
_
p
at
h
_level_c
o
nfl
i
cts()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-ort: implement
c
heck_for_dir
e
c
t
ory
_
r
enam
e
()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah
N
ewren
merge-ort: i
m
plement apply_dir_rename() and check_dir_renamed(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-ort: implement compute_c
o
llisions()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-ort: modify c
o
l
l
ect_renames() for director
y
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Ne
w
re
n
merge-ort: implem
e
nt handl
e
_
d
irecto
r
y_lev
e
l_confli
c
t
s()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah
N
ew
r
en
m
erg
e
-ort
:
implement comput
e
_rename_counts()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
E
l
ija
h
Newren
m
e
rg
e
-ort:
copy get_renamed_di
r
_p
o
r
t
ion() from merg
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
E
lijah
N
e
wren
merge-or
t
: add outline of get_prov
i
sional_directory_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-ort: add outline for co
m
p
ut
i
ng di
r
ectory
r
e
names
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-07
Elijah Ne
w
ren
me
r
g
e-o
r
t: collect which dir
e
ctories
a
re removed in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-07
E
lijah Newren
m
erge-ort: initialize
a
nd free new d
i
rec
t
ory rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-07
Elijah New
r
en
m
e
rg
e
-
o
rt: add n
e
w data struct
u
r
e
s for directory rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah Newren
di
f
fc
o
re-
r
e
name:
r
emove u
n
necessary
d
upli
c
ate
entry
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah Newr
e
n
mer
g
e
-
ort:
ad
d
handling f
o
r diff
e
rent
t
ypes of fi
l
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Eli
j
ah Ne
w
ren
merge-o
r
t: copy find_f
i
rst_merges
(
) implemen
t
ati
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
El
i
ja
h
N
e
wren
merge-ort: implement for
m
at_commi
t
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
E
l
ijah Newren
m
e
rge-ort: copy and
adapt merge_subm
o
dule() fro
m
merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
E
l
ijah Newren
merge-ort:
c
opy and adapt merge_3way() fro
m
m
e
rge-r
e
cursive
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
E
lijah Ne
w
r
e
n
merge-ort: f
l
esh out impleme
n
tation of handl
e
_cont
e
nt_m
e
rge(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah N
e
w
r
en
merge-ort: handle book-keeping ar
o
und two- and three
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Eli
j
ah Ne
w
re
n
merge-ort:
i
mplement unique_path()
he
l
per
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
El
i
jah Newren
merge-ort
:
handl
e
d
i
recto
r
y
/file conflic
t
s that rem
a
i
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
E
l
ij
a
h Newren
m
e
rge-ort: handle
D
/F
c
onflict where
dire
c
tory disappears
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-17
Elijah Newren
merge-o
r
t
:
i
mplem
e
nt merge_i
n
c
ore_recursive()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-17
Elijah Newr
e
n
me
r
ge-ort: make clear_internal
_
opts()
aware of partial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-17
Elijah Newr
e
n
m
e
rge-ort: copy
a
f
ew small help
e
r functions fr
o
m
merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-17
E
lij
a
h N
e
wren
c
o
mmit: mo
v
e rever
s
e_commit_list() fr
o
m m
e
rge-recursiv
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
El
i
jah Newren
merge-ort:
a
dd implem
e
ntation of typ
e
-chang
e
d r
e
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Elijah Newren
merge
-
ort: a
d
d implem
e
ntation
o
f norma
l
rename han
d
ling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
El
i
jah
New
r
en
merge
-
ort: add
implementation of rename collisio
n
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Elijah Newren
merge-
o
rt: add implement
a
t
ion of r
e
name
/
del
e
te co
n
flicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Elijah
Newre
n
mer
g
e-ort: add imple
m
entati
o
n of both
s
i
des
r
enaming
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Elijah N
e
wren
merge-ort: add i
m
plementation
of both sides re
n
aming
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Newren
diffcor
e
-rename: accelerate
r
ename_
d
st setup
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elija
h
Newren
d
i
ff
c
ore-rename: simplify and accelerate reg
i
s
t
er_rename_src()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Newren
t
4058: ex
p
lo
r
e du
p
licate tree entry
handl
i
ng
in a bit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elija
h
Newren
t4
0
58: add more tests
a
nd do
c
umentation
f
or dupli
c
ate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Newren
diff
c
o
re-ren
a
me
:
reduce jumpiness in p
r
o
gress
c
o
u
nters
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
E
li
j
a
h
Newren
d
iffcore-rename
:
sim
p
lify
limi
t
che
c
k
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
E
l
ija
h
N
ewre
n
diffcore-r
e
name:
a
void
u
sage of glo
b
al in too_many_
r
e
n
a
me_ca
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Newr
e
n
diffcore
-
r
ename: r
e
n
a
m
e nu
m
_
c
rea
t
e
t
o
num_destin
a
t
ions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah
N
ewren
merge-or
t
: add basic outline for p
r
ocess_re
n
ames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elija
h
N
e
wren
merge-or
t
: implement
compare
_
pa
i
rs(
)
a
n
d co
l
lect_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Ne
w
ren
m
e
rge
-
o
rt: implement dete
c
t_regular_renames
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah N
e
wren
m
e
r
ge-
o
rt: add i
n
i
t
ia
l
o
utl
i
ne for basic rename detection
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah
N
ewren
merge-ort:
add basic d
a
ta structures
for
han
d
ling re
n
ames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h Newren
merg
e
-
o
rt:
add mo
d
ify/delete h
a
ndling and de
l
ayed output
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
N
e
wren
merge-ort: add die-no
t
-impleme
n
t
e
d stub handle_c
o
ntent_mer
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ijah Newren
mer
g
e-ort: add function group
i
ng c
o
mme
n
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
lijah N
e
w
r
en
merge-ort: add a paths_to_
f
ree fi
e
ld t
o
m
e
rge_
o
ptio
n
s_internal
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
N
ewre
n
merge-ort: add a
p
a
t
h_co
n
f
lict field to merge_options_inter
n
al
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort:
add a
clear
_
inter
n
al_opts helper
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
m
erge-ort: a
d
d a few includes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newr
e
n
merge-ort:
f
ree data structures i
n
merge_f
i
n
a
l
ize()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Ne
w
r
e
n
merge-or
t
: add i
m
plementatio
n
of reco
r
d_
c
onflicted_index_ent
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
tree
:
enable cmp_cache_n
a
me_compare() t
o
b
e
use
d
elsewh
e
re
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Newren
me
r
ge-ort: a
d
d implementation of checkout()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
New
r
en
merge-ort: bas
i
c
o
utlin
e
for
merge_swit
c
h_to_resu
l
t()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Ne
w
ren
me
r
g
e
-
o
rt
:
step 3 of tree
w
r
i
ti
n
g
-
- handling sub
d
ir
e
ctories
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ijah Newren
me
r
ge-ort: step 2 of
t
ree writing -- function to
c
reate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
El
i
jah N
e
wren
merge-o
r
t:
step 1 of t
r
ee writing
--
r
e
c
o
rd ba
s
ename
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Ne
w
ren
m
erge-ort: have p
r
ocess_e
n
tries opera
t
e in
a def
i
ne
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ijah Newre
n
merge
-
ort:
a
dd a preliminary simple p
r
o
cess_en
t
ri
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Newren
merge-ort: avoi
d
recursing into
i
d
entic
a
l
t
r
e
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
N
ew
r
e
n
merge
-
ort: record stage and aux
i
liary info for every
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Ne
w
re
n
merge
-
or
t
:
compute a f
e
w
more useful fields for collect
_
merg
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
El
i
jah Newren
merge
-
ort: avoid repeat
i
ng
f
i
l
l_tree_
d
es
c
riptor() on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
lijah Newren
m
e
rge-ort: i
m
plemen
t
a ve
r
y ba
s
ic col
l
ect_
m
erge_info()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: add
an err() function simila
r
to one from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
Newren
merge-ort
:
use histogram diff
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
lijah New
r
e
n
merge-ort: port
m
erge_start() from merg
e
-recursive
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ijah Ne
w
ren
merge-ort: add
some high-
l
e
v
el alg
o
rith
m
s
t
ructure
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
Newre
n
merge-ort:
setu
p
b
asic internal data
s
t
ruc
t
ures
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
Elijah Newren
stash: fix
stas
h
appli
c
ation in sp
a
rse-
c
heck
o
ut
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
El
i
jah Newren
st
a
s
h
:
r
em
o
ve un
n
ec
e
ss
a
ry process forking
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next