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
Update error message and code comment
2021-08-05
E
l
ijah Newren
Update e
r
r
or message and code comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elija
h
Newr
e
n
m
erge-strategies
.
txt
:
a
dd
c
overage of the `
o
rt` m
e
rge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah N
e
wren
git-rebase
.
t
xt: cor
r
e
c
t
o
ut-of-da
t
e an
d
misleading
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
merg
e
-strategies
.
txt: f
i
x
simp
l
e capitalization error
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
El
i
jah Newren
merge-str
a
tegies
.
t
x
t: avoid gi
v
ing special
preference
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
merge-s
t
rategies
.
txt: do not imply using
c
opy detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
El
i
ja
h
New
r
e
n
merge-strategies
.
txt
:
upd
a
te
word
i
ng for the resolve
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
E
l
i
jah
N
ewren
Documentatio
n
:
e
dit awkward refe
r
e
n
ces to `git me
r
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Eli
j
ah New
r
en
directory-ren
a
me-detection
.
txt
:
smal
l
up
d
ates due to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah
Newren
git-rebase
.
txt: correct ant
i
quated c
l
aims about --
r
ebase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
E
lijah New
r
e
n
rename:
b
um
p
limit defaults ye
t
again
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
E
l
ijah Newre
n
diffcore-ren
a
me: treat
a
r
ename_limit o
f
0
a
s unlimite
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
Elija
h
N
e
wren
doc
:
clar
i
fy docum
e
n
t
ation for rename/copy
l
imi
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
Elijah Newren
diff: correct warni
n
g message wh
e
n re
n
ame
L
imit exceeded
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-30
Elij
a
h Newren
m
er
g
e-recu
r
si
v
e: handle ren
a
me-t
o
-self case
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-30
Elijah Newren
m
e
rge-ort: ens
u
re we con
s
ul
t
df_confli
c
t and p
a
th_conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-30
El
i
jah N
e
wren
t
6
42
3
: test d
i
rec
t
ory renames c
a
using
rename-to-self
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
El
i
jah
Newren
merge-ort: add prefetching for c
o
nte
n
t merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
Elijah Newre
n
diffcore
-
rename: use a d
i
fferent prefet
c
h
for basen
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
Elijah Newren
diffcore-r
e
n
ame: al
l
ow different missing_object_cb
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
Eli
j
ah Ne
w
r
e
n
t64
2
1: add tests checkin
g
for excessive object
downloads
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-16
Elijah Newren
prom
i
s
o
r-r
e
mote: o
u
t
put trace
2
s
t
ati
s
tics
f
o
r
n
umber
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
Elij
a
h N
e
w
ren
mer
g
e-ort: miscellaneous
t
ouch
-
ups
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
Eli
j
a
h
N
e
wren
Fix various
i
ssues found in comments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
Elijah New
r
e
n
diffc
o
re-rename: avoid u
n
necessary strdup'in
g
in break_id
x
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
Elijah Newren
m
e
rge-ort: repla
c
e
st
r
in
g
_
l
ist_df_name_compare w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-27
Elijah Newren
di
r
: introduce readdir_ski
p
_dot
_
and
_
dotdot()
h
elper
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Elijah
Newren
merge-ort, diffcore-rename
:
emp
l
oy cached r
e
names
w
he
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Elijah New
r
e
n
merge-ort: handle interac
t
ions of ca
c
hing and rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Elija
h
Newren
mer
g
e-ort: add helpe
r
functions fo
r
using cached renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Eli
j
a
h
Newren
m
erge-
o
rt: preserve
c
ached renames for the appropriate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
merge-ort: avoid acci
d
ent
a
l API
m
is-use
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Ne
w
r
en
merge-or
t
: a
d
d c
o
de to
c
h
e
ck for whether cache
d
re
n
ames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Elijah
Ne
w
ren
me
r
ge-ort: populate caches of rename dete
c
tion results
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
E
l
ij
a
h Newr
e
n
merg
e
-ort: add data
s
tructures for in-me
m
o
r
y
caching
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
E
l
ijah Newre
n
t6
4
2
9: testca
s
es
f
or r
e
member
i
ng ren
a
m
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Eli
j
ah New
r
en
fast-rebase: wri
t
e c
o
nflict state to working
t
ree
,
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Elijah Newren
fas
t
-re
b
ase: change assert(
)
to
B
UG()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Eli
j
ah Newren
Documentation/technical: describe reme
m
bering renames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-13
Elijah
Newren
git-p
r
ompt:
work under set -u
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
Elij
a
h Ne
w
ren
di
r
:
i
nt
r
oduce readdir_ski
p
_dot_and_dotdo
t
() he
l
per
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
E
l
ijah Newren
dir: tr
a
verse into un
t
racked dir
e
ctories if
t
hey may
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
Elijah
N
ewren
dir:
avoid unnecessary traversal int
o
i
g
n
o
red directory
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
Elijah Newr
e
n
t300
1
,
t7300: add testcas
e
s
howcasing
m
i
s
sed dire
c
tory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
Elijah New
r
en
t7300: add testcas
e
showing unne
c
essary
t
ravers
a
l into
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
Elijah Newr
e
n
ls-fi
l
es: erro
r
ou
t
on -i unle
s
s -o or -c are s
p
ecified
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
E
l
i
jah Newren
dir: report number of visited di
r
ectori
e
s
and
p
at
h
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-12
E
lij
a
h
N
ew
r
en
dir: c
o
nvert tr
a
ce c
a
lls to tra
c
e2 equivalents
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-04
Elijah
N
e
wren
t6423: ren
a
me fi
l
e wi
t
hin direc
t
ory
t
hat
o
the
r
s
i
de
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-31
Elija
h
Newre
n
s
e
q
u
en
c
e
r: fix edit handling for
che
r
ry-p
i
ck and revert
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
Add testing
with merge-ort merge strateg
y
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newr
e
n
t6423: mark remaining
e
xpecte
d
failure under
me
r
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
Revert "merge-ort: ignore
th
e
di
r
ectory
r
ename split
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
El
i
jah Newren
mer
g
e-recursiv
e
:
add a
b
unch of
FIX
M
E
comments documenting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
mer
g
e-or
t
: writ
e
$GIT
_
DI
R
/AUTO
_
M
ERG
E
whenev
e
r we hit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Elij
a
h Newren
t
:
mark seve
r
al submodule mergi
n
g
t
e
sts
as fixed u
n
der
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Eli
j
ah
Newren
merge-or
t
: implement CE_SKIP_WORK
T
REE
h
an
d
l
i
ng with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Elija
h
Newren
t6428: new
t
e
s
t for SKIP_WORKTRE
E
handl
i
n
g and
c
onflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
E
l
ijah Newren
m
e
rge-ort:
support sub
t
ree sh
i
fting
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
merg
e
-ort: let renormalization
c
han
g
e modif
y
/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
El
i
jah Newren
merge
-
ort: have ll_
m
erge() use a spec
i
al a
t
tr_ind
e
x
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Elijah N
e
wren
merge-ort:
a
dd a s
p
e
c
i
al minimal inde
x
j
ust for renormal
i
zation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
m
erge-ort:
u
se STABLE_
Q
SORT i
n
stead of QSORT
where
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-18
Elija
h
Newren
diffc
o
re-rename
:
determi
n
e which relevant_sourc
e
s
are
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-18
Eli
j
ah Newren
merge-ort: record the reason
t
hat we want a rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-18
El
i
ja
h
New
r
en
diffcore-
r
en
a
me: add co
m
pu
t
ation of number of unk
n
own
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-18
Elijah Newre
n
diffcore-rename: check if
we h
a
ve enough renames for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-18
Elijah Newre
n
di
f
fcore-rename
:
only compute dir_
r
e
name_count
f
or
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-18
E
lijah N
e
wr
e
n
merge-ort: record the
r
e
ason
that we
w
ant
a
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-18
Elija
h
Newr
e
n
merge-ort, di
f
fc
o
re-
r
ename:
t
w
e
ak dirs_r
e
moved and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-18
Elijah Newren
dif
f
core-rename:
ta
k
e adv
a
ntage of "majority rule
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
d
i
ffcore-re
n
a
me: a
v
oid doi
n
g basename comparisons for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Ne
w
ren
merge-ort: skip
rename detec
t
ion
e
ntirel
y
if
p
ossible
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
m
e
rge-ort:
u
se rele
v
a
n
t_source
s
to filter possible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
m
erge-ort: precompute whether directo
r
y rename detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
merge-ort
:
intr
o
d
uce wrappers for alternate tree traversal
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-11
El
i
ja
h
Ne
w
ren
merge-ort: add data structur
e
s for a
n
alte
r
nat
e
tree
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
merge-o
r
t
:
precomp
u
te s
u
bset o
f
sources
fo
r
which we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
diffc
o
re-ren
a
m
e
: enab
l
e filtering possible rename sources
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-03-04
Elijah Newren
Documenta
t
ion/RelNotes: improve relea
s
e
n
ote for re
n
am
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-27
E
l
ijah New
r
e
n
dif
f
cor
e
-r
e
na
m
e: com
p
ute dir_renam
e
_guess
f
rom dir_r
e
nam
e
_count
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-27
El
i
jah Newren
di
f
fcore-rename
:
limit dir_rename_counts computation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-27
Elijah
Ne
w
ren
dif
f
c
ore-renam
e
: compute dir_rename_counts
i
n
s
tages
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-27
Eli
j
ah
Newren
d
i
f
f
core-
r
ename:
extend cleanup
_
dir_rename_info()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-27
El
i
j
a
h Newren
diffco
r
e-r
e
n
a
me: move dir_rename_count
s
into dir_
r
ename_in
f
o
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-27
E
l
ijah Newren
diffcore-rename: add function f
o
r
c
l
earing dir
_
r
e
name_count
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newr
e
n
Move computation of
dir_renam
e
_count from merge
-
ort
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newr
e
n
diffc
o
re-rename: add a mapping
of des
t
inat
i
on names
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newren
d
i
ffcore-rename
:
p
r
ovide
b
asic impl
e
mentation of idx_pos
s
i
b
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-27
Eli
j
ah New
r
en
diffcore-rename:
u
se dir
e
ctory rename guided bas
e
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
E
l
ijah Newren
merge-ort: ca
l
l
diff
c
ore_rename() directly
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
E
l
ijah Newren
g
i
td
i
ffcore
d
oc:
mention new
p
reliminary s
t
ep for re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newren
diffcor
e
-renam
e
: g
u
ide
i
n
e
xact re
n
a
m
e
detection based
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
Elijah
N
e
wren
d
i
ffcor
e
-re
n
ame: com
p
lete find_bas
e
name_matches
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newre
n
diffco
r
e-rename: compute basenames of source
and dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
Elija
h
Newren
t
4
001: add a tes
t
comparin
g
basen
a
me
similarity and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-16
E
l
ijah Newren
diff
c
o
r
e-rename:
filt
e
r rename_src l
i
st when pos
s
ible
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-02-12
Elijah New
r
e
n
diffcore-rename: no poi
n
t
tr
y
ing to find
a match
b
etter
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-24
Elijah Ne
w
ren
merge-ort: beg
i
n p
e
rfor
m
ance work;
i
ns
t
rument wit
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-01-24
Elijah Newre
n
m
erge-ort: ignore
the d
i
rectory r
e
n
a
me sp
l
i
t confl
i
ct
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next