repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
trace2.h: fix trivial comment typo
2021-09-20
Eli
j
ah Newren
trace2
.
h: fix
t
riv
i
al com
m
ent typo
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
El
i
jah Newren
me
r
g
e
-or
t
:
restart merge with cac
h
ed renames to reduce
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
Eli
j
ah Newren
merge-ort: avoid recurs
i
ng into di
r
ectories w
h
en w
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
Elijah
N
ewren
merge-ort: defer recurs
i
n
g
i
n
to directories when mer
g
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
Elij
a
h
N
ewren
merg
e
-ort: ad
d
a handle_d
e
f
err
e
d_entri
e
s() h
e
lper
f
un
c
t
i
o
n
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newren
merge-
o
rt: add da
t
a structures for allowab
l
e
trivial
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newren
merg
e
-ort:
add
s
o
me more expla
n
at
i
ons i
n
c
ol
l
ect_merge
_
i
nfo_
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newren
me
r
g
e-ort: resolve paths early
w
h
en we have suff
i
cient
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-15
Elijah Newren
rename:
bump l
i
mit defaults yet again
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-15
Elijah Newren
di
f
fcore-rename: treat a rename_li
m
it of 0
a
s
unlimited
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-15
Elijah Newren
d
o
c: clarify doc
u
mentation for
rename/copy limit
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-15
El
i
jah Newren
diff: correct warning mess
a
g
e when r
e
nameLimit exceeded
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-30
E
lijah Newren
merge-recursive: ha
n
dl
e
rename-t
o
-self cas
e
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-30
Elijah
Newren
merge-ort: ensure we consult df_conflict and p
a
th_conflic
t
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-30
Elijah
N
e
wr
e
n
t6423:
test
directory
renam
e
s c
a
using
r
ename-
t
o-self
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-28
Elijah Newren
merge
-
o
rt: add prefe
t
c
hing
for conten
t
merge
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-28
Elijah New
r
en
d
iffcore-rename:
u
se
a di
f
fe
r
ent
p
refetch for basename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-28
Elijah Ne
w
ren
d
iffcore-rename: allow different missing_object_cb
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-28
E
lijah Newren
t6
4
2
1
:
add
tests
c
he
c
king for excessive object downloads
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-16
Elijah Newren
promisor-
r
em
o
te: output trace2
s
t
atis
t
ics for
numb
e
r
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-09
El
i
j
a
h
N
e
w
r
e
n
me
r
ge-ort: mi
s
cellaneous t
o
u
ch-
u
ps
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-09
Elijah Newren
Fix va
r
ious issues found in comments
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-09
Eli
j
ah Ne
w
ren
diffcore-ren
a
me: avoid unn
e
c
e
s
sary strdu
p
'
i
ng
i
n break_
i
d
x
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-09
E
lijah
N
ewre
n
merge-ort: replace string_l
i
st_
d
f_n
a
me_comp
a
r
e
with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-27
Elijah Newren
dir: introdu
c
e readdir_skip_dot_an
d
_dotd
o
t() helpe
r
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newre
n
mer
g
e-or
t
, diffcor
e
-rena
m
e: employ
cached renames when
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elija
h
Newren
m
er
g
e-ort
:
handle interaction
s
of cachin
g
and rena
m
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
E
li
j
ah Newren
merge-ort: add helper func
t
ions for u
s
in
g
cached renames
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah N
e
wren
merg
e
-ort: prese
r
ve cac
h
ed renames fo
r
the
a
pprop
r
iate
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
E
l
ijah
N
ewren
mer
g
e
-
ort: av
o
id accidental
API
mis-use
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah N
e
wren
m
e
rge-ort: add
code to check for whethe
r
cac
h
e
d
renames
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
El
i
jah Newren
me
r
ge-ort: populate caches of renam
e
d
e
tection result
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah New
r
en
merge-ort:
a
d
d
dat
a
stru
c
t
ur
e
s for
in-m
e
m
ory ca
c
hing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
t642
9
: testc
a
s
es f
o
r rem
e
mbering renames
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
E
lijah Newren
fast-rebase:
w
r
i
te confli
c
t state
t
o working
tree,
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
E
lijah Ne
w
ren
fast-re
b
ase: change asser
t
() t
o
BUG()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Ne
w
r
en
Doc
u
ment
a
tion/technica
l
:
describe
r
emembering renames
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-13
Elijah Newren
git-prompt: work
u
nder set -u
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
Elija
h
Newre
n
di
r
: introduce readdir_skip_dot_and_dotdot
(
) helper
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
E
l
ijah New
r
e
n
dir: trave
r
se
i
n
to untracked directories
if they m
a
y
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
Elijah
Newren
dir: avoid unnec
e
ssa
r
y traver
s
al int
o
i
g
no
r
ed direc
t
or
y
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
Elijah Newren
t
3
001, t7300
:
add te
s
tcase showcasing missed dir
e
ct
o
ry
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
Elijah Ne
w
ren
t7
3
00: add testcase showi
n
g unnecessary traversal in
t
o
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
El
i
jah Ne
w
ren
ls-files: erro
r
out on -i unless -o or -
c
are
specifie
d
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
Elijah Newren
dir: report num
b
er of vi
s
ited di
r
e
c
t
or
i
es and paths
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-12
Elijah
Newren
dir:
convert trace ca
l
l
s
to t
r
a
ce2
equivalents
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-05-04
Elijah
N
e
w
r
e
n
t6423:
rename file
within directory that other side
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-31
Elijah Newren
sequence
r
:
fix edit h
a
ndling f
o
r cher
r
y-pick
an
d
revert
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
Add testing with
merge-
o
rt merge strateg
y
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Eli
j
a
h
Newren
t6423: mark remaining e
x
pected
f
ailure under
m
erge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newre
n
Re
v
ert "me
r
ge-ort: i
g
n
ore th
e
directory
rename spl
i
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
E
lijah Newren
merge-recursive: add a bunch o
f
FIXM
E
comments d
o
cumenting
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elijah
N
ewren
merge-ort
:
write $GIT_DIR
/
AUT
O
_MERGE when
e
v
e
r we hit
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
t: mark several submodule merging tests as fixed und
e
r
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elija
h
Newren
merge-o
r
t: implement CE_SKIP_WORKTREE han
d
l
i
n
g
w
i
th
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
t6428: n
e
w test for
S
KIP_WORK
T
RE
E
han
d
l
ing and con
f
licts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
merg
e
-
ort: support s
u
btree shifting
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elija
h
Newren
merge
-
ort: let re
n
ormalization chang
e
m
o
di
f
y/delete
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
merge-ort: have ll_merg
e
(
) use
a
special at
t
r_index
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
E
l
i
j
a
h Newren
merge-or
t
: add
a special minim
a
l index just fo
r
renormalization
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elija
h
Newren
merge-ort: use STABLE_QS
O
RT i
n
ste
a
d of QSOR
T
w
her
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
Elijah New
r
en
d
iffcore-rename:
d
etermin
e
wh
i
ch
r
elevant_sources
are
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
Eli
j
ah N
e
w
r
en
merge-ort:
reco
r
d th
e
reason that we want a r
e
name
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
Elijah
Newren
diffcore
-
rename: add comput
a
tion o
f
number o
f
unkno
w
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
Elijah N
e
wren
diffc
o
re-rename: c
h
eck if we have enough
rena
m
es for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
Elijah Newr
e
n
di
f
fcore-rename: only
c
ompute dir_
r
e
n
ame_count for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
Elijah
N
e
wren
merge-ort: r
e
cord
the re
a
s
o
n that we want a re
n
ame
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
Elijah Newren
merge-or
t
, diffcore-rename: tweak dirs_remo
v
ed and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-18
Elijah
N
ewren
diffcor
e
-rename
:
take ad
v
antage of "
m
ajority r
u
les
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
diffc
o
re
-
r
e
n
ame: avoid doing b
a
sen
a
me comparisons fo
r
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
E
l
ijah New
r
en
mer
g
e-ort:
s
kip re
n
ame detection entirely
i
f
pos
s
i
b
le
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
merge-ort: use relevant
_
s
o
urces to f
i
lte
r
possible
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
Eli
j
a
h
Newren
merge-ort: precomp
u
te w
h
e
t
h
er directory r
e
n
a
m
e detection
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
E
l
i
jah Newren
me
r
ge-ort: in
t
rodu
c
e wrappers fo
r
altern
a
te tree
t
ravers
a
l
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
merge-ort: a
d
d
data structures fo
r
a
n
alter
n
ate
tree
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
mer
g
e
-
o
rt: precompute subset
of sources f
o
r w
h
ich
we
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-11
E
l
i
jah Newren
diffcor
e
-re
n
am
e
:
e
nabl
e
filte
r
ing possible
rename source
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-03-04
Elijah Newren
Documentation/RelNotes: impr
o
ve rele
a
se
note f
o
r re
n
a
m
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elijah
Newren
diffcore-renam
e
: compute
dir_
r
e
n
a
m
e
_gu
e
ss
f
rom
d
ir_renam
e
_c
o
unts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elij
a
h New
r
en
diff
c
o
re-re
n
ame:
l
imit di
r
_
r
en
a
me_coun
t
s
c
omputation
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elijah
N
ewren
d
iffcore-re
n
ame: com
p
ute dir_rename
_
counts in s
t
a
ges
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elijah
Newren
dif
f
core-rename: extend clean
u
p_dir_rename_info()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newr
e
n
diffcore-ren
a
me:
mov
e
dir_rename_co
u
nts into d
i
r_rename_info
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elij
a
h
N
ewren
d
iffcore-rename: ad
d
function for
clearing dir_r
e
nam
e
_count
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
E
l
ij
a
h Newren
Move c
o
mputation
o
f dir_rename
_
count fro
m
merge-ort
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
El
i
j
a
h Newren
diffcore-rename:
a
d
d
a mapping o
f
d
estinati
o
n names
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elijah N
e
wren
diffcore-r
e
n
ame: provide
b
asic
imp
l
emen
t
ation of id
x
_p
o
ssibl
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-27
E
l
ijah Newren
diffcore-ren
a
me: use di
r
ectory rename
g
uided ba
s
ename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elijah N
e
wren
me
r
ge-o
r
t
:
c
a
ll dif
f
core_rename() d
i
r
e
c
tly
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newren
git
d
iffcore doc: men
t
ion new p
r
eliminary step
for rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newren
di
f
fcore-rename: guide
inexact rename dete
c
tio
n
bas
e
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newren
diffcor
e
-rename: complete fi
n
d_b
a
sename_matches()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-16
El
i
jah Newren
diff
c
ore-r
e
name:
c
ompute basen
a
mes of source an
d
dest
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newren
t4001: add a test c
o
mparing
b
asename similarity
and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elija
h
Newren
d
iffcor
e
-rename
:
filter
rename_src list whe
n
possible
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-02-12
Elijah N
e
wr
e
n
diffcore-r
e
name:
n
o point trying to fi
n
d a
m
atch better
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-01-24
Elijah Newren
merge-ort: beg
i
n performance w
o
r
k
; i
n
strume
n
t with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-01-24
Eli
j
a
h
Newren
merg
e
-ort: ig
n
o
re the
directory rename split c
o
n
f
lict
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-01-24
E
lijah
N
ewren
merge-ort: f
i
x massi
v
e leak
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-01-21
Eli
j
ah Newren
merge-ort: f
i
x a direc
t
ory rename
detection bug
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next