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: implement CE_SKIP_WORKTREE handling with conflicted entries
2021-03-20
Elijah Newren
me
r
ge-
o
rt: impl
e
ment
CE_
S
KIP_
W
ORKTR
E
E handling w
i
t
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newren
t6428: new t
e
st for S
K
I
P
_
WORKTRE
E
ha
n
d
l
in
g
a
nd con
f
licts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elij
a
h Newren
m
erge-or
t
: support subtree shifti
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-03-20
Eli
j
ah Newre
n
merge-
o
r
t: le
t
renorma
l
iz
a
tion change modify/d
e
l
ete
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elijah New
r
e
n
merge-
o
rt:
have ll_merge() use a spec
i
a
l attr_index
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-03-20
Elijah Newre
n
me
r
ge-ort: add a special minimal index just f
o
r renorma
l
iz
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-03-20
Eli
j
ah
N
ewren
merge-ort: u
s
e STABLE_QSORT instea
d
of QSORT where
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-03-18
Elijah
N
ewren
diffcore-re
n
ame: d
e
term
i
ne w
h
ich rel
e
vant_source
s
ar
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-03-18
E
lijah
Newren
merge-ort: r
e
cord the reason that we want a
rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-03-18
E
l
ijah New
r
en
di
f
fcore-
r
ename: add computation of
n
u
m
ber of unknown
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-03-18
E
l
ijah Newr
e
n
diffcor
e
-rename: chec
k
if we have en
o
u
g
h ren
a
mes fo
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-03-18
El
i
jah N
e
wren
diffcore-rename: only
c
o
mpute dir_renam
e
_cou
n
t
f
or
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-03-18
Elijah Newren
m
erge-ort: r
e
cord the rea
s
on that
w
e want a ren
a
me
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-03-18
Elijah Newren
mer
g
e-ort,
diffcor
e
-renam
e
: tweak d
i
r
s
_removed an
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-03-18
Elijah
Newr
e
n
diffcore-r
e
name: take advantage of
"
m
a
jorit
y
r
u
les
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-03-11
Elijah N
e
wren
diffc
o
r
e
-rename:
a
void doi
n
g basename
comparisons for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newren
me
r
ge-ort: ski
p
rename
d
et
e
ction entirely if po
s
sible
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Ne
w
re
n
merge-o
r
t
: use relevant_sources to f
i
lter possible
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-03-11
Elijah
Newren
merge-ort: prec
o
mput
e
w
hether directory re
n
ame d
e
tection
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-03-11
E
lija
h
Newren
m
e
rge-or
t
: introduce wrap
p
e
rs for alterna
t
e
tree traversal
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-03-11
Elijah Newr
e
n
merge-o
r
t: add data
s
tr
u
ctures
f
or
a
n al
t
ernate t
r
ee
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-03-11
E
l
i
jah
N
ew
r
en
merge-
o
rt: pre
c
ompute subset of sources f
o
r which we
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-03-11
Elijah
N
ewren
diffcore-rename:
e
n
a
b
le filter
i
ng possible rename sources
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-27
E
l
ijah Newren
diffcore
-
rename
:
com
p
ute dir_rename_guess from dir_re
n
ame_coun
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newre
n
diffcore-rename: limit dir_rename_coun
t
s
compu
t
ation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-27
E
lijah Newren
dif
f
core-
r
ename: compute
dir_
r
e
name_counts
in stage
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elijah New
r
e
n
diffcore-r
e
name: extend cleanu
p
_dir_rename_i
n
f
o()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elij
a
h Newren
dif
f
c
ore-ren
a
me:
m
o
v
e dir_rename_counts into d
i
r_rename_info
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-27
Elijah Newr
e
n
d
i
ffc
o
r
e
-rename: add
f
u
nction for clearing dir_ren
a
me_count
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-27
Eli
j
ah N
e
wren
Move computa
t
i
o
n of dir_rename
_
count f
r
om merge-ort
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-27
E
l
i
j
ah N
e
wr
e
n
diffcore-rename
:
add a mapping of de
s
t
i
nat
i
on names
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-27
El
i
jah Newren
diffco
r
e-rename: provide basic
implementation
of
i
dx_possibl
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-27
Eli
j
ah Newren
diffcore-rename: use directory re
n
ame
g
uided
basename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elija
h
Newren
merg
e
-ort: call diffcore_rename() directly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newren
gitdiffcore doc: mention new
preliminary step f
o
r rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elijah New
r
e
n
diff
c
ore-ren
a
me: guide inexact rename det
e
c
t
i
o
n based
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newren
diffcore
-
r
e
name: complet
e
fi
n
d_basename_
m
a
t
ches()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elij
a
h Newren
diffcore-r
e
name: compute base
n
a
mes
o
f so
u
rce
a
n
d
dest
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-16
E
l
ijah N
e
wren
t4001: add a test comparing basename similarity
a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-16
Elijah Newre
n
diff
c
ore-rename: filter rename_sr
c
list when possible
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-12
Eli
j
a
h
Newre
n
d
iffcor
e
-rename:
n
o
point
trying to find a match be
t
ter
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-11
Junio C
Hamano
Sync with maint
commit
|
commitdiff
|
tree
2021-02-11
Jun
i
o C Ham
a
no
Merge branch
'en/merge-ort-perf'
commit
|
commitdiff
|
tree
2021-02-11
Junio
C
Ha
m
a
n
o
Merge branch 'e
n
/ort-directo
r
y-re
n
ame'
commit
|
commitdiff
|
tree
2021-02-11
Junio C
Hamano
Me
r
ge branch
'tb/ci-run-cocci-with-18
.
04' into maint
commit
|
commitdiff
|
tree
2021-02-11
Junio C Ha
m
a
n
o
Merge br
a
n
c
h
'
tb/ci-run-cocci-wi
t
h-
1
8
.
0
4'
commit
|
commitdiff
|
tree
2021-02-10
Junio C
H
am
a
no
The seventh
batch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-10
J
u
n
io C
H
aman
o
Merge
branc
h
'ab/d
e
tox-gettext-tes
t
s'
commit
|
commitdiff
|
tree
2021-02-10
J
unio
C H
a
mano
Merge branch
'
ab/grep-pcr
e
-invalid-utf8'
commit
|
commitdiff
|
tree
2021-02-10
Juni
o
C
Hamano
M
erge branch 'ab/retire-pcre
1
'
commit
|
commitdiff
|
tree
2021-02-10
J
unio C Hamano
M
erge branch
'
jk
/
pretty-lazy-load-commit'
commit
|
commitdiff
|
tree
2021-02-10
Junio C Hamano
Merge branch 'ds/mo
r
e-ind
e
x
-
c
l
eanups'
commit
|
commitdiff
|
tree
2021-02-10
Junio
C
H
amano
Merge
branch 'rs/wor
k
tree-list-verbose'
commit
|
commitdiff
|
tree
2021-02-10
Junio
C H
a
mano
Mer
g
e
bran
c
h
'js/rebase-i-commit-cle
a
nu
p
-fix'
commit
|
commitdiff
|
tree
2021-02-10
Juni
o
C Hamano
Merge bra
n
c
h
'
j
k/t0000-c
l
eanups'
commit
|
commitdiff
|
tree
2021-02-10
J
u
nio C Ha
m
an
o
Mer
g
e branch 'sg/t7800-difftool-r
o
b
u
stify'
commit
|
commitdiff
|
tree
2021-02-10
Junio C Hamano
Merge bran
c
h 'ab/lose-grep-debug'
commit
|
commitdiff
|
tree
2021-02-10
Junio C Hamano
Me
r
ge branch 'jk/use-oid-p
o
s'
commit
|
commitdiff
|
tree
2021-02-08
Junio
C
Hamano
Sync with 2
.
30
.
1
commit
|
commitdiff
|
tree
2021-02-08
T
a
ylor Blau
.
gi
t
hub
/
workf
l
ows/m
a
in
.
yml:
run
s
tatic-analys
i
s on
.
.
.
Reported-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-08
Junio C Hamano
Git
2
.
30
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-08
Jun
i
o C Hamano
Me
r
ge branch
'pb/ci-matrix
-
wo
-
shor
t
cu
t
' int
o
maint
commit
|
commitdiff
|
tree
2021-02-08
Junio C H
a
mano
Merge branch
'p
b
/blame-func
n
ame-r
a
nge-
u
serdiff' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2021-02-08
Junio C Hamano
Merge branch 'jk/p5303-sed-portability-fi
x
'
into main
t
commit
|
commitdiff
|
tree
2021-02-08
Junio C
Hamano
M
e
rge branch 'ab
/
b
ra
n
c
h
-sort'
into
m
aint
commit
|
commitdiff
|
tree
2021-02-08
Junio C
Hama
n
o
Merge branch 'ma/mo
r
e-opaque-lock-file' into maint
commit
|
commitdiff
|
tree
2021-02-08
J
u
nio
C
Hamano
Merg
e
br
a
n
c
h
'dl/p
4
-enco
d
e-after-kw-e
x
pansion' into
.
.
.
commit
|
commitdiff
|
tree
2021-02-08
Junio
C Hamano
M
e
rge branch '
a
r/t
6
01
6
-modernise' into main
t
commit
|
commitdiff
|
tree
2021-02-08
Jun
i
o C Hamano
Merge bran
c
h 'zh/arg-hel
p
-
format' into mai
n
t
commit
|
commitdiff
|
tree
2021-02-08
Junio C Hamano
M
e
r
ge branch 'ma/doc-p
a
ck-
f
or
m
a
t
-varint-for-s
i
zes'
.
.
.
commit
|
commitdiff
|
tree
2021-02-08
Junio C Ham
a
n
o
Mer
g
e bran
c
h 'ma/t1300-clea
n
up' into maint
commit
|
commitdiff
|
tree
2021-02-08
Junio C Hama
n
o
Merge branch 'fc/t6030-bisect-reset-removes-auxiliary
.
.
.
commit
|
commitdiff
|
tree
2021-02-06
Juni
o
C
H
amano
Sync wi
t
h
m
a
int
commit
|
commitdiff
|
tree
2021-02-06
Junio C Hamano
The sixth batc
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-06
J
unio
C Hama
n
o
Merge
branc
h
'sg/t
e
st-st
r
ess-job
s
'
commit
|
commitdiff
|
tree
2021-02-06
Junio C Ha
m
a
n
o
Merg
e
branch 'jk/w
e
at
h
er-bal
l
oon-
r
equ
i
re-variadic
-
macro'
commit
|
commitdiff
|
tree
2021-02-06
J
u
ni
o
C Ha
m
ano
Merge
branch 'pb/c
i
-m
a
trix-wo-shortcu
t
'
commit
|
commitdiff
|
tree
2021-02-06
J
u
n
io C Hamano
Mer
g
e
branc
h
'pb/blame-funcnam
e
-range-use
r
diff'
commit
|
commitdiff
|
tree
2021-02-06
Junio C
H
ama
n
o
M
erge
branch 'j
k
/p5303-
s
ed-portabili
t
y-fix'
commit
|
commitdiff
|
tree
2021-02-06
Ju
n
io
C
Hamano
Merge bran
c
h '
j
v/pack-ob
j
ects-narrower-r
e
f-iteration'
commit
|
commitdiff
|
tree
2021-02-06
Junio C Haman
o
M
erg
e
branch 'ph/use-delete-r
e
fs'
commit
|
commitdiff
|
tree
2021-02-06
Junio C
Hamano
Merge bra
n
ch
'
tb/
l
s-refs-
o
p
tim'
commit
|
commitdiff
|
tree
2021-02-06
Junio
C Ham
a
no
Mer
g
e bra
n
c
h
'zh/ls-fil
e
s-deduplicate'
commit
|
commitdiff
|
tree
2021-02-06
J
u
n
io C Hamano
Merge branch '
d
s/c
a
che-tree-basics'
commit
|
commitdiff
|
tree
2021-02-06
Junio
C
H
amano
M
e
r
g
e
branch 'en/
o
rt-
c
onflict-
h
andling'
commit
|
commitdiff
|
tree
2021-02-06
Jun
i
o C
H
amano
Mer
g
e branch 'so/log
-
diff-merge'
commit
|
commitdiff
|
tree
2021-02-06
J
uni
o
C Hamano
P
repare for
2
.
30
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2021-02-06
Junio C Ham
a
no
Merg
e
branch 'js
/
s
k
ip-dashed
-
built-
i
ns-from-confi
g
.
.
.
commit
|
commitdiff
|
tree
2021-02-06
J
unio C Ha
m
a
no
Merge branch 'jt/packfile-as-uri-doc
'
into maint
commit
|
commitdiff
|
tree
2021-02-06
Junio C Hamano
Mer
g
e branch 'a
b
/fsck-d
o
c
-fix' in
t
o
maint
commit
|
commitdiff
|
tree
2021-02-06
Junio C Hamano
M
e
rge bran
c
h 'jk/log-ch
e
rry-pic
k
-
d
upli
c
ate-patches
.
.
.
commit
|
commitdiff
|
tree
2021-02-06
Junio C Hamano
Merge branch 'jk/forbid-lf-in-gi
t
-url' into maint
commit
|
commitdiff
|
tree
2021-02-06
Junio C Hamano
Merge branch
'jc
/
macos-inst
a
ll-dependenci
e
s-fix' into
.
.
.
commit
|
commitdiff
|
tree
2021-02-06
Junio C
H
a
ma
n
o
M
e
rge branch 'tb/local-clon
e
-ra
c
e
-
doc' int
o
m
aint
commit
|
commitdiff
|
tree
2021-02-06
Ju
n
i
o C Hamano
M
e
rg
e
br
a
nch 'b
c
/doc
-
st
a
tus
-
sho
r
t' into maint
commit
|
commitdiff
|
tree
2021-02-06
Junio C Hama
n
o
Merge bra
n
ch
'ab/gettext-charset-comment-fix'
into
.
.
.
commit
|
commitdiff
|
tree
2021-02-06
Junio C Hamano
M
e
r
ge branch 'ug/do
c
-lose-dircach
e
' into maint
commit
|
commitdiff
|
tree
2021-02-06
Junio C Hamano
Mer
g
e branch 'ad/t4129-setfacl-target-fix' into maint
commit
|
commitdiff
|
tree
2021-02-06
Junio C Hamano
Merge
bran
c
h 'jk/t55
1
6-defl
a
ke' into maint
commit
|
commitdiff
|
tree
2021-02-06
Junio
C
Hamano
Merge branc
h
'
vv/send
-
e
m
ail-w
i
th-less-secure-apps-access
.
.
.
commit
|
commitdiff
|
tree
next