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
Git 2.31.1
2021-03-04
E
lijah N
e
wren
Document
a
tio
n
/RelNotes: improve release note for
r
ena
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newren
mer
g
e
-
ort: c
a
ll
d
iffcore_rename()
directly
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
E
l
ijah Newren
git
d
iffco
r
e doc: mention new pre
l
iminary
s
tep
for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
Eli
j
a
h Newr
e
n
diffcore-re
n
ame: guide inex
a
c
t
rename det
e
ction bas
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
E
l
ijah Newren
diffcore-rename: comple
t
e fi
n
d
_basename_
m
atches()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
El
i
jah Ne
w
re
n
diffcore-rena
m
e:
c
ompute
basenam
e
s
of sou
r
ce and dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
Elijah
Newren
t4001:
a
dd a test c
o
mparing ba
s
e
name
s
i
m
ilar
i
ty and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
Elijah
N
ewren
diffcore
-
rename: filter rename_src
list when possible
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-12
Elijah Newren
diffcore-rename: no poin
t
trying to
fin
d
a
ma
t
ch bett
e
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-24
Elijah Newren
merge-ort: begin performance
work; instrument with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-24
Elijah Newren
merge-ort:
i
gnore the
d
irec
t
ory rename spli
t
co
n
fli
c
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-24
Elijah N
e
wre
n
merge-ort: fix
massive
l
ea
k
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
E
l
ij
a
h Newren
m
e
rge-ort: fix a
d
irectory rena
m
e det
e
ction bug
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
E
l
ijah
N
ewren
merge-ort
:
process
_
ren
a
mes() now
needs more defensi
v
eness
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Ne
w
ren
merge-ort: implement app
l
y
_
directory_rename_modif
i
cations()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
E
lij
a
h Newren
merge-ort: add a new
t
oplevel_dir f
i
eld
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah
Newren
merge-ort: im
p
le
m
ent ha
n
dl
e
_path_lev
e
l_co
n
f
l
icts()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah
Newren
merge-ort: im
p
l
ement check_for_dir
e
cto
r
y_re
n
ame
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newre
n
merge
-
o
rt: implemen
t
app
l
y_dir_r
e
n
a
me() a
n
d check_dir_renamed()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newr
e
n
m
e
r
ge
-
ort: implem
e
nt compu
t
e_collisions()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge-ort
:
modify collect_rename
s
(
)
for
dire
c
t
ory rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah
N
e
w
r
en
me
r
ge-ort
:
im
p
lement handle_directory_l
e
vel_conf
l
icts()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
E
l
ija
h
N
e
wren
m
e
rge-or
t
:
imple
m
ent
compute_rename_
c
o
unts()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
El
i
jah Newr
e
n
merg
e
-o
r
t: cop
y
get_renam
e
d_dir_portion() fro
m
merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elijah Newren
merge
-
ort
:
add outline of
g
et_
p
rovision
a
l_di
r
ectory_renam
e
s(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-21
Elija
h
Newren
merg
e
-ort: add
outline for c
o
mputing directory re
n
ames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-07
Eli
j
a
h
Newren
merge-ort: collect which directo
r
i
e
s
a
re removed in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-07
Elijah Newren
merge-ort: initi
a
lize and
f
ree new dire
c
tory rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-07
Elijah Newre
n
merge
-
ort:
a
dd new data structures
for
directory rena
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah Newren
diff
c
ore-rename: r
e
move u
n
necessary duplicate
entry
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah Newren
merge-ort: add handli
n
g
fo
r
di
f
ferent
types of f
i
les
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah Newre
n
m
e
rge-ort:
c
opy find_firs
t
_mer
g
es() implementation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah New
r
e
n
merge-ort:
i
m
p
lement format_commit()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah Newren
merge-
o
r
t
: copy an
d
adapt mer
g
e_submodule()
f
rom merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elij
a
h Newren
me
r
ge-ort: copy and adapt merg
e
_3way() from merge-recursive
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
E
lij
a
h Newren
merge-or
t
: flesh ou
t
implement
a
t
i
on of
handl
e
_con
t
ent_merge()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah Ne
w
ren
m
e
rge-ort: handle book-ke
e
p
i
ng
arou
n
d
two- an
d
three
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
El
i
jah Newren
merge-ort: implement unique_path()
helper
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah Newren
merge-ort: hand
l
e direct
o
ry/file conflict
s
th
a
t remain
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-04
Elijah
Ne
w
ren
merge-or
t
: han
d
le D/F conflict where directory disappe
a
rs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-17
Elijah Ne
w
ren
merge-ort:
i
mplement
m
erge_incore_re
c
ursive
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-17
Elijah Newren
merge-ort: m
a
ke c
l
ear_internal_opts() awa
r
e of partial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-17
E
li
j
a
h
N
e
wre
n
merge-o
r
t: co
p
y a
few smal
l
helper functions
from merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-17
Elijah Newre
n
com
m
it: move r
e
verse_commit
_
list() from merge-recu
r
sive
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Elija
h
Newre
n
merg
e
-ort: add implement
a
tion of type-ch
a
n
g
ed
r
ename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
E
li
j
ah Ne
w
r
en
merge-o
r
t: add implementation of nor
m
al
re
n
ame h
a
ndling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Elijah Newren
me
r
ge-ort: add implementatio
n
of rena
m
e
collisions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Elijah Newren
m
erge-ort: add
implementation of rename
/
delete conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Elijah
N
ewren
merge-ort
:
add implement
a
tion of both
s
ides r
e
nam
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-16
Elijah
Ne
w
ren
merge-ort: add implemen
t
ation of both sid
e
s r
e
nami
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Newren
dif
f
core-re
n
a
m
e: acceler
a
te ren
a
me_dst set
u
p
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
E
l
ijah Newren
diff
c
o
r
e-rename:
s
im
p
lify and accel
e
rate regis
t
er_re
n
ame_src()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
E
lijah Newren
t40
5
8: explore du
p
l
icat
e
tree e
n
try h
a
n
d
l
i
ng in a bit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Newr
e
n
t4058: add more tes
t
s and docume
n
tation for du
p
licate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah
N
ewr
e
n
diffcore
-
rena
m
e: red
u
ce jumpi
n
e
s
s in progress co
u
nters
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Newren
d
iffcore-rename:
sim
p
lif
y
limit chec
k
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Newren
diffco
r
e-rename: a
v
oid usage of global in too_many_rename_ca
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Newren
di
f
fco
r
e-ren
a
me: re
n
ame num_create to
n
u
m
_destinations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elijah Newren
me
r
ge-ort:
a
dd basi
c
outline for process_re
n
ames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Elija
h
N
e
wren
merg
e
-ort: i
m
p
l
e
m
ent compare_pairs() and
c
o
l
lect_rena
m
es()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
E
lijah Newren
m
e
rge
-
ort: impl
e
m
en
t
detect_regu
l
ar_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
Eli
j
a
h Newren
merge-ort: ad
d
initial outline f
o
r
basic rena
m
e
detectio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-14
El
i
jah New
r
en
me
r
ge-ort: add
b
asic data structures fo
r
handling
renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ijah Ne
w
r
e
n
merge-ort: add mo
d
ify/delete
h
andl
i
n
g
and delayed output
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h Ne
w
ren
merge-ort: ad
d
die-not-implemented stub handle_co
n
t
ent_m
e
rge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: add func
t
ion grou
p
ing comments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: a
d
d a path
s
_to
_
fr
e
e
f
ield to merge_opt
i
ons_inte
r
nal
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ijah
N
ewren
mer
g
e-o
r
t: add a p
a
th_conflict field to mer
g
e_opti
o
ns
_
internal
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
lij
a
h Newre
n
merge-ort: add a clear_inte
r
nal_opts helper
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Eli
j
a
h
Ne
w
ren
m
erge-ort: add a few
i
ncludes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
li
j
a
h
Newren
merge-ort
:
fre
e
dat
a
str
u
c
t
ure
s
in merge_finalize()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ijah Newren
merge-ort:
add
implementati
o
n of r
e
cord_conf
l
i
c
te
d
_i
n
dex_ent
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ijah
N
ew
r
en
tree: enable cmp_cache_name_comp
a
re() t
o
be used elsew
h
ere
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah N
e
wren
mer
g
e-
o
rt: add
i
mplementation of checkout()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Newren
merge-
o
rt: ba
s
ic outline for merge_switch_
t
o_
r
e
s
u
lt()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: step 3
o
f
tree writ
i
ng -- han
d
ling subdirect
o
ri
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
N
ewre
n
merge-ort: step
2
of tree w
r
iting -- function to crea
t
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah N
e
w
ren
merge-or
t
: step 1 of tree writing -- r
e
cord
basenames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
lijah
Newren
mer
g
e-
o
rt:
h
ave process_entries
o
perate in a
d
efine
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merg
e
-ort: add a
preliminary si
m
p
l
e p
r
ocess_en
t
ries
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Newre
n
merge-ort: a
v
oid recurs
i
ng into identical
t
rees
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
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
E
lijah N
e
wren
merge-or
t
: compute a few more useful fie
l
ds for collect_merg
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
El
i
jah Newren
merge-
o
rt: a
v
oid repeating
f
ill_tree_
d
escri
p
tor() on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: implement
a very basic
c
ollect_merge_info()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Newren
m
erge-ort:
a
d
d
an err
(
)
f
u
n
c
tion similar to one
f
r
om
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort
:
u
s
e histogram diff
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Eli
j
a
h New
r
e
n
merge-ort: p
o
rt m
e
rg
e
_start()
from merge-r
e
cursive
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
N
e
wren
m
e
r
g
e-ort: add some high-lev
e
l a
l
gorithm structur
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: setup ba
s
ic
internal data struc
t
ures
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
Elijah
N
ewren
s
t
a
s
h
:
f
ix st
a
sh app
l
ication in
sp
a
rse-checkouts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
Elijah Newren
stash
:
remov
e
unne
c
essary
p
roce
s
s
forkin
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
Elija
h
New
r
en
t
7
0
12: ad
d
a tes
t
case demon
s
tra
t
ing stash
apply bugs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
Elijah Newre
n
s
hortlog: use strset from st
r
m
ap
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
E
l
ijah Newre
n
U
se new HASHMAP_
I
NIT macro to simplify hashma
p
initialization
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
El
i
jah Newren
strmap: take advanta
g
e of FLEXPT
R
_ALLOC_
S
TR
w
hen relev
a
nt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
El
i
j
a
h Newren
strmap: ena
b
le allocations to come from a mem_poo
l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-06
Elijah
N
ewren
s
tr
m
ap:
a
dd a strset su
b
-type
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-06
E
lijah
N
ewren
s
t
rmap:
s
p
l
it
c
re
a
te_en
t
ry() out of strmap_put
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-05
Elijah Newren
st
r
map:
a
dd functions facilitating use as a stri
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next