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
merge-ort: add pool_alloc, pool_calloc, and pool_strndup wrappers
2021-07-30
Elijah Newren
merge
-
ort:
add pool_alloc, pool_ca
l
l
oc, and po
o
l_strndu
p
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
E
l
ijah New
r
en
di
f
fcore-rename:
u
se a mem_pool
for exact rename detection
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newren
m
erge-ort: r
e
name str
{
map,i
n
tmap,
s
e
t}_func
(
)
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
Elij
a
h
N
ewre
n
merge-ort:
restart mer
g
e wi
t
h cached ren
a
m
e
s to reduce
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
E
l
ijah Newren
merge-ort: avoid
recursing
into directories when
we
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
El
i
jah N
e
wren
merge-
o
rt: def
e
r rec
u
rsing into dir
e
ct
o
ries when merge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newren
merg
e
-ort: add a handle_deferred_entries() helper
f
unction
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
El
i
jah N
e
w
r
en
m
e
r
g
e-ort
:
add data
structures for allowab
l
e triv
i
al
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
E
l
ijah New
r
en
m
e
rge-or
t
: add some more
e
xplana
t
ions
i
n collect_me
r
g
e
_
i
nfo_
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newren
m
erge-ort
:
resolve pat
h
s
early when
w
e have sufficient
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-30
Eli
j
ah Newre
n
merge-recurs
i
ve:
h
an
d
le rename-to-self case
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-30
Elijah
N
e
wren
m
erge
-
o
r
t:
e
n
sur
e
we consult d
f
_co
n
flict and path
_
conflicts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-30
El
i
jah Newren
t
6423:
test directory
renames
c
ausi
n
g rename-to-sel
f
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-28
El
i
jah Ne
w
ren
me
r
ge-ort: add prefetc
h
ing for
c
o
n
ten
t
me
r
ges
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-28
Elijah Newren
diffcore-rena
m
e:
use
a
d
ifferent prefetch
for b
a
s
ename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-28
Elijah N
e
wren
dif
f
co
r
e-rename: allow
differ
e
n
t miss
i
ng_object_
c
b
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-28
Elijah Newren
t
6
42
1
: add tests
c
h
e
c
kin
g
for
exces
s
i
v
e
object downloads
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-16
El
i
jah Ne
w
r
en
promis
o
r-
r
emote: output trace2 statist
i
cs for
n
umber
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-09
E
lijah
N
e
w
ren
m
erge-ort:
m
iscellaneous to
u
ch-ups
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-09
Eli
j
ah New
r
en
Fix vario
u
s issues found in comments
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-09
Elijah Newre
n
d
if
f
core-rename: avoid unnecessary strdu
p
'ing
in break_idx
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-09
Elijah
Newren
merge-ort: repl
a
ce string_l
i
st
_
df_na
m
e_compare with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-27
Elijah Newre
n
d
ir: in
t
roduce re
a
ddir_sk
i
p_dot_an
d
_d
o
tdot()
h
elper
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
merge-ort, di
f
fc
o
re-r
e
name
:
empl
o
y
cached renames wh
e
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
merge-ort: handle intera
c
tions of cac
h
ing and re
n
a
me
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
m
e
rge-ort:
add helper functions for using cached
rename
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah
N
ewren
merge-ort: preserve cached renames fo
r
the appro
p
riate
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Ne
w
ren
merge-ort
:
avoid acciden
t
al API mis-u
s
e
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah
N
ewren
merge-ort: add cod
e
to check for whether cached ren
a
m
e
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
E
l
ijah
Newr
e
n
merg
e
-ort: populate ca
c
hes of rename d
e
te
c
t
i
on results
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elij
a
h N
e
wren
merge-ort: add
d
ata structures for in-memory c
a
ching
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elij
a
h Newren
t642
9
: te
s
tcases f
o
r reme
m
bering renames
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
E
l
i
j
ah
N
ew
r
en
fast-rebase: write conflict state to work
i
ng tre
e
,
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
fa
s
t-re
b
as
e
: chang
e
a
s
s
e
rt()
to
BUG()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Ne
w
r
en
Documentation/techn
i
cal: desc
r
ibe remembering
r
e
names
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-13
Elijah Newren
git-prompt: work under
s
et -
u
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
E
l
ijah Newren
dir:
i
ntroduce readdir_
s
kip_dot_and
_
do
t
d
o
t() h
e
lper
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
Eli
j
ah
Newre
n
dir: traverse
i
n
t
o
u
ntracked di
r
e
c
tories
if
they may
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
Elijah N
e
wren
dir: avoi
d
unnecessary
trave
r
sal
i
nto
i
gnored directo
r
y
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
Elijah Newren
t3001, t7300: ad
d
t
e
stcase showca
s
ing misse
d
d
irecto
r
y
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
Elijah Newren
t7300
:
add testcase showing
u
nnecessary trav
e
rsal
i
nto
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
Elijah Newren
ls-
f
iles:
e
r
r
o
r out on
-i unless -o or
-
c
are sp
e
c
ified
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
Eli
j
ah Ne
w
ren
dir: re
p
ort number
of visited directori
e
s and paths
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
Elijah Newren
d
i
r: co
n
ver
t
t
r
ace ca
l
ls to trace2 equivalen
t
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-04
Elijah
Newren
t64
2
3: re
n
a
m
e
file within directory that o
t
her side
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-31
Elijah Newren
s
e
quencer: fix edit handling for c
h
erry-pi
c
k and revert
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elijah
New
r
en
Add testing wi
t
h m
e
rge-ort merg
e
strat
e
gy
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elijah New
r
e
n
t642
3
: mark
rema
i
ning e
x
pe
c
ted failu
r
e under
merg
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elij
a
h Newren
Revert
"
m
e
rge-ort: ignore
t
he directory rename split
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
El
i
j
ah N
e
wren
merge-
r
ecu
r
s
i
ve:
a
dd a bunch of
FIXME comments doc
u
menting
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
E
l
ijah New
r
en
merge-ort:
w
rite $G
I
T
_
D
IR/AUT
O
_M
E
R
GE whenever we hit
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elijah N
e
wren
t: mark several submodule merging te
s
ts a
s
fixed
un
d
er
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elijah
N
ewren
merge-ort: imp
l
ement CE_SKIP
_
WORKTREE handling with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elija
h
Newr
e
n
t
6
4
2
8: n
e
w test for SKI
P
_WORKTREE handling
and conflic
t
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
mer
g
e-or
t
: supp
o
rt su
b
tree shi
f
ti
n
g
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
E
lijah Newren
merge-ort:
let
r
enormalization change modify
/
delete
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
E
l
ijah Newren
mer
g
e
-ort: have ll_m
e
rge() use a spec
i
a
l
attr
_
in
d
ex
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newre
n
me
r
ge-
o
rt:
a
dd a
s
p
e
cia
l
m
i
nimal i
n
d
ex
just for reno
r
maliza
t
i
o
n
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Eli
j
a
h
Ne
w
ren
merge-o
r
t: use STABLE_QSORT i
n
stead of QSORT where
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
Elijah Newren
diffco
r
e-rename: determine whic
h
relevant_source
s
are
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
E
lijah Newren
merge-or
t
: reco
r
d the reason that we
w
a
nt a rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
E
lijah Newren
diffcore-ren
a
m
e
:
a
d
d com
p
utation o
f
numbe
r
of unknown
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
Elij
a
h
New
r
e
n
diffcore-rename: check if we have enough
r
e
n
a
m
e
s for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
Elija
h
Newren
d
i
ffcore-ren
a
me: only compute dir_r
e
name_c
o
unt for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
Elij
a
h Newren
m
e
r
g
e-
o
rt: r
e
cord the reason t
h
at we w
a
nt
a
rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
El
i
j
ah New
r
en
merge-ort, diffcore-rename: t
w
eak di
r
s_removed and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
El
i
jah New
r
en
dif
f
cor
e
-ren
a
me
:
take adv
a
ntag
e
of "ma
j
orit
y
rules
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
d
iff
c
ore-rename: avo
i
d
doin
g
ba
s
ename comparisons
for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
mer
g
e-ort: skip rename detection entirely if
possible
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Ne
w
ren
m
e
r
g
e-ort:
u
s
e
relevant_sources to filter possible
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
Elijah
N
ewren
m
e
rge-ort: precomput
e
whether direct
o
ry rename d
e
tection
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
El
i
jah Newre
n
m
erge-ort: introduce wr
a
ppers fo
r
alternate tree traversa
l
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
E
lijah Newren
merge-ort: add data s
t
ructur
e
s
for an al
t
ernate tree
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
Elijah N
e
wren
merge-or
t
: prec
o
m
pu
t
e subset of sources for
which we
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
E
lijah Newren
diffcore
-
rename: enable
f
ilteri
n
g
possible rename sources
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-04
Eli
j
ah Newren
Documentation/RelN
o
tes: improve
r
e
lease note for rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elij
a
h Newren
diffcore-rename: com
p
ute dir_ren
a
me_gu
e
ss from
dir
_
rena
m
e_counts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newren
diff
c
o
r
e
-rename: limit dir_rename_counts
c
omputation
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elij
a
h
N
e
wren
diffcore-renam
e
: compute dir_rename_cou
n
ts in stages
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
E
lijah New
r
en
diffcore-r
e
n
ame: exten
d
cleanu
p
_dir_rename_info()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
E
li
j
ah
Newren
diffcore-rename: move
d
ir_rename_cou
n
ts into dir_
r
enam
e
_
i
nfo
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newre
n
diffcore-rename: add
f
u
n
c
t
ion for clearing
d
ir_rename
_
count
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newren
Move compu
t
ation of dir_ren
a
m
e_count from merge-ort
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Eli
j
a
h Newren
d
iffcore-rename
:
add a mapping
of desti
n
ation names
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newren
diffcore-rename:
p
rovide b
a
s
ic implement
a
tion of idx_
p
ossibl
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elijah
N
e
wren
di
f
fc
o
r
e-r
e
name
:
use
directory
rena
m
e guided basename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-16
Eli
j
ah Newren
merge-
o
rt:
c
all diffc
o
re_r
e
name()
dire
c
tly
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newren
gitdiffcore doc
:
mention new preliminary step for rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-16
Eli
j
ah Newre
n
d
i
f
fco
r
e-rename: guide inexact renam
e
de
t
e
ction based
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newren
diffcore-rename: compl
e
te
find_b
a
senam
e
_
matches()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newren
d
iffco
r
e-rename: compu
t
e b
a
senames of sourc
e
and
d
est
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elijah
N
ewren
t4001: add
a
t
est compar
i
ng ba
s
en
a
me similarit
y
and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elijah N
e
wren
diffcore-re
n
ame: fil
t
er rename_src li
s
t when possible
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-12
Elija
h
Newren
diffcore-r
e
nam
e
: no point trying t
o
find a match better
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-01-24
Eli
j
ah New
r
en
merge-or
t
: begin pe
r
formance work; instrument with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-01-24
Elijah Newren
me
r
ge-ort: i
g
nore the directory rename split
conflict
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-01-24
Elijah Newren
merge-or
t
:
f
i
x massive leak
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-01-21
Elijah N
e
wren
merge-ort
:
fix a dire
c
to
r
y rename detection bug
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merg
e
-ort: process_re
n
ames()
now
n
eeds more def
e
nsiv
e
ness
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge
-
ort: i
m
p
l
e
m
ent apply_director
y
_renam
e
_
m
odificatio
n
s()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next