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
diffcore-rename, merge-ort: add wrapper functions for filepair alloc/dealloc
2021-07-30
Elijah Newren
diffcore-rename, merge-ort: add wrapper func
t
i
o
n
s
for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newre
n
merge-ort: switch our strmaps
over to using
memory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
E
l
ijah Newre
n
merge-ort: set up a m
e
mory
p
ool
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
El
i
j
a
h
N
ew
r
en
merge-
o
rt:
a
dd pool_alloc,
p
ool_cal
l
o
c
, and pool_
s
tr
n
dup
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newre
n
di
f
fcore
-
rena
m
e
:
use
a
mem_pool for exact rename detection
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Ne
w
ren
m
er
g
e
-
ort: rename str{map,intmap,se
t
}_fu
n
c()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newren
merge-
o
rt: restart
m
e
r
ge with ca
c
h
ed rena
m
es to reduce
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
E
l
ija
h
Newre
n
merge-ort:
a
void recursing into
d
i
r
ectories when
w
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
Elijah
N
ewren
merge-ort: def
e
r recu
r
sing into directories when
merge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
El
i
jah Newren
m
er
g
e-ort
:
add a handle_deferr
e
d_entries() helper f
u
nction
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newr
e
n
mer
g
e-ort: add dat
a
s
tru
c
t
ures for allowable trivia
l
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
E
l
ijah Ne
w
ren
m
erge-o
r
t: add
s
ome m
o
re explanations in collect_mer
g
e
_info_
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
Elijah
Newren
merg
e
-ort: res
o
lve pa
t
hs early when we
have suffic
i
ent
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-30
E
lija
h
Newren
merge
-
r
e
cu
r
sive: handle
r
e
n
ame-
t
o-self
case
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-30
Eli
j
ah New
r
e
n
m
e
rge-ort:
ens
u
r
e
w
e
consult df_conf
l
ict and
p
ath_conflicts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-30
Elijah Newre
n
t
6
423: test directory renames c
a
using rename-to-s
e
lf
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-28
Eli
j
ah
N
ew
r
en
mer
g
e-ort:
add pref
e
tching for content merges
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-28
E
l
ij
a
h Newren
diff
c
o
re-rena
m
e
: use
a
different prefet
c
h for basename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-28
E
l
i
jah Newren
diffcore-rename: allo
w
diff
e
rent missing_o
b
ject_cb
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-28
Eli
j
ah
N
e
wren
t
6421: add tests ch
e
cki
n
g for exces
s
ive
o
b
j
ect down
l
oads
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-16
Elijah Newren
p
r
omis
o
r-re
m
ote:
o
u
t
p
ut tr
a
c
e
2
s
t
atis
t
i
c
s for number
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-09
Elijah Newren
merg
e
-ort: mis
c
ellaneous touch-
u
ps
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-09
E
l
ijah Newren
Fix various issues foun
d
in
c
o
m
ments
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-09
Elijah Ne
w
ren
diff
c
ore-rename:
avoid unnecessar
y
str
d
up'ing
i
n break_idx
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-09
Elijah Newren
merge-ort: r
e
plac
e
string_li
s
t_df_name_c
o
mp
a
re
with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-27
Elijah Newren
dir: int
r
oduce read
d
i
r
_
skip_dot_and_dotdot
(
) helper
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
merge-ort,
d
if
f
core-rename:
employ c
a
ched renames when
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah
Newren
merge-ort: handle
i
n
t
e
r
actions of caching
and
rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah
Newren
merge-or
t
:
add helper function
s
for using ca
c
hed r
e
na
m
es
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elij
a
h Ne
w
ren
merge-
o
r
t: pres
e
rve cached ren
a
mes for
th
e
appropriate
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
E
lijah
Ne
w
ren
merge-
o
rt
:
avoid accidenta
l
API mis-
u
se
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
E
lijah
N
ewren
merge-or
t
:
a
dd code to che
c
k for whe
t
h
er
ca
c
hed renames
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah
N
ewren
merge-o
r
t: populate cache
s
o
f
r
e
n
a
me detect
i
on
r
esu
l
ts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
me
r
ge
-
ort: add
data s
t
ructu
r
es for
i
n-memory caching
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
t6429: testcas
e
s for rememb
e
ring re
n
ames
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
fast-r
e
base: write conflict state t
o
wo
r
king tree,
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah New
r
e
n
fa
s
t
-
r
e
b
a
se:
change as
s
ert() to
BUG(
)
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah N
e
w
ren
Do
c
umentation/technical: describe
reme
m
bering renames
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-13
E
li
j
a
h Newren
g
it-
p
rompt: w
o
rk
und
e
r set
-u
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
E
lij
a
h Newren
dir: introduc
e
readdir_skip_dot_and_dotdo
t
() hel
p
er
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
Elij
a
h Newren
d
ir: traverse into un
t
r
acked
d
irectories
if they
may
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
Elijah Newren
dir: avoid unnecessary
t
raversal
into ignored directory
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
Elijah New
r
en
t3001, t7300: add t
e
stcase showcasi
n
g missed
directory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
Elijah Ne
w
ren
t
7
300: add te
s
tcase sh
o
win
g
unnecessary traversal into
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
Elijah Newren
l
s
-files: error out on -i unles
s
-o
or -
c
are specified
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
Elijah Newren
dir: report
number
o
f v
i
s
i
te
d
directories
and path
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
Elijah
New
r
en
dir: conver
t
tra
c
e calls
to
t
race2 equ
i
valents
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-04
Elijah Newren
t6423: rename file wi
t
hin dire
c
tory that ot
h
er side
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-31
Elijah New
r
e
n
sequencer: fix edit han
d
li
n
g for
cherr
y
-
p
ic
k
and revert
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elija
h
Newren
Add tes
t
in
g
with
m
erge-ort merge strategy
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
E
l
ijah
Newr
e
n
t6423: mark remaining expec
t
e
d
failure under merge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
El
i
j
a
h Newren
R
ever
t
"mer
g
e-ort: ignore
t
he directory rename split
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
merg
e
-rec
u
rsive:
add a
b
unc
h
of FIXME comme
n
ts docum
e
nting
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newr
e
n
me
r
ge
-
o
rt: write $GIT_DIR/AUTO_MERGE
w
henever we h
i
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
E
l
ijah Newren
t: mark several
s
ubmodule merging tests as fixed unde
r
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
merge-ort
:
impl
e
ment C
E
_
S
KIP_WORKTREE handling
w
ith
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
E
lijah Newren
t6428: new test for SKI
P
_WORKTREE
h
andling an
d
c
o
n
flicts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Eli
j
a
h
Newren
merge-ort: suppo
r
t subtree shifting
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newre
n
merge-ort: l
e
t
r
e
n
o
rma
l
ization change modif
y
/delete
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newr
e
n
merge-ort:
h
ave
ll_merge()
u
se a spe
c
ial
attr_i
n
de
x
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elija
h
N
e
wren
merge-ort: add a sp
e
cia
l
m
inimal i
n
dex just for renormaliz
a
t
i
on
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Ne
w
ren
merge-ort: use S
T
ABL
E
_QSORT in
s
tead of QSORT w
h
ere
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
Elijah
N
ewr
e
n
diffcore-rename: det
e
rmine whi
c
h rel
e
v
ant_sources are
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
Elij
a
h Newren
merge-ort: record the re
a
son that w
e
want a ren
a
me
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
Elija
h
Ne
w
r
e
n
di
f
fcore-rename: ad
d
computation of n
u
m
b
er of un
k
nown
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
Elijah Newren
diffcore-rename
:
check if
we have
enoug
h
rename
s
for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
Elijah Newren
diffcore-rename: onl
y
compute dir_rena
m
e_count for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
E
l
i
j
ah N
e
w
ren
me
r
ge-or
t
: r
e
cord the reason
that w
e
w
ant a re
n
ame
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
Elija
h
Newre
n
m
erge-or
t
,
diffcore-rename: tweak
d
irs_rem
o
v
e
d and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
Elijah Newren
diffcore-rename: take advantage o
f
"majority rules
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
diffcore-rename: av
o
id
doing basename
c
om
p
arisons for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
Elijah New
r
en
merge-ort: skip rename d
e
tection enti
r
e
l
y i
f
possible
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
Elijah
Newren
m
erge-or
t
: use rel
e
van
t
_s
o
urces to fi
l
t
e
r
possible
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
E
l
ijah Ne
w
r
en
merge-ort:
p
recompute
whether directory r
e
nam
e
d
e
tectio
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
merg
e
-
ort: intr
o
duce wrappers for alt
e
rnate t
r
ee travers
a
l
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
E
l
i
j
ah Newren
merg
e
-ort: add d
a
t
a structures fo
r
a
n
alt
e
rnate tree
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
merge
-
ort: precomp
u
te subset of so
u
rces for which we
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
Elijah
N
ewre
n
diffcore-renam
e
: enable f
i
ltering poss
i
b
l
e rename so
u
rces
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-04
Elijah Newren
Docum
e
n
t
at
i
on/RelNot
e
s: improve
r
el
e
ase note for rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elija
h
Newren
diffcore-ren
a
me: compute di
r
_rename_guess
fro
m
dir_rename_cou
n
ts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elij
a
h New
r
en
diffc
o
re-r
e
name:
limit dir_rename_counts c
o
mputa
t
ion
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elijah
Newren
diffcore-renam
e
: c
o
m
pute dir_rename_
c
ounts in sta
g
es
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newren
d
i
f
f
core-rename: extend
c
leanup_dir_rename_info()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newr
e
n
diffcore-rena
m
e:
move dir
_
re
n
a
m
e_counts i
n
to
di
r
_re
n
ame_info
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elijah
N
ewren
d
iff
c
ore
-
rename: a
d
d
f
u
n
ctio
n
for clear
i
ng dir_rename_count
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
E
lijah Newren
Move computati
o
n of d
i
r_rena
m
e_c
o
un
t
from merge-ort
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
E
lijah N
e
wren
d
iffcore-rename
:
add a mapp
i
n
g
of destination
names
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newren
diffcore-r
e
name: provide basic
i
mplementation of idx_possibl
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elija
h
Newren
diffco
r
e
-
rename: u
s
e dire
c
tory rename guide
d
basena
m
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newren
merge
-
o
r
t: call d
i
f
f
core_ren
a
m
e
() directly
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elijah
N
e
w
ren
g
i
tdiff
c
ore doc: menti
o
n ne
w
p
r
eli
m
inary step
f
or renam
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-16
Eli
j
ah Newre
n
d
i
f
fcore-rename
:
guide inexact rename detect
i
on
b
ased
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Ne
w
ren
diffcore-rename: co
m
p
l
e
t
e find_base
n
ame
_
match
e
s
(
)
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newre
n
d
iffcore-rename: compute ba
s
enames of
s
ource and dest
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newren
t4001:
a
dd a test comparing basename simi
l
arity
a
nd
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elij
a
h
N
e
w
ren
diff
c
o
re-rename: filter rename_s
r
c
list when po
s
sible
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-12
Elijah Newren
d
i
ffc
o
re-renam
e
: no point trying to fi
n
d a m
a
tc
h
b
ette
r
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-01-24
El
i
jah Newren
merge-ort: begin performance work; instrum
e
nt with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-01-24
Elijah
N
ewren
m
erge-ort: ig
n
ore the directory rename
s
p
lit conflict
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-01-24
Elijah Newren
m
erg
e
-ort: fix massiv
e
l
e
a
k
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next