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: record stage and auxiliary info for every path
2020-12-13
Elijah Newren
merge-
o
rt: recor
d
stage and
a
ux
i
liary
i
nfo
f
or every
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ijah
New
r
en
merge-ort: compute a few more useful fi
e
l
ds for colle
c
t_merg
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
m
erg
e
-ort: a
v
oid repe
a
ting fill_tree_
d
e
s
criptor() on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
Newren
m
erge-ort:
i
mplement
a
v
e
ry b
a
s
i
c
c
ollect_merge_info()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h Newre
n
merge-ort: add an err() function sim
i
lar to
o
ne from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ijah Newren
m
e
rge-ort: use hi
s
t
ogr
a
m diff
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newre
n
m
e
rge-ort: por
t
m
e
rge_st
a
rt() from merge-recur
s
i
v
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
N
ewren
merge-or
t
: add
some
h
i
gh-leve
l
a
lgor
i
thm structur
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Newren
merge-
o
rt: setup basic
intern
a
l
data structures
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
Elijah Newren
s
h
ortlog: use
s
tr
s
et from st
r
m
ap
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
Elijah Newren
Us
e
new HASHMA
P
_IN
I
T macro to simplify hashma
p
ini
t
ialization
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
Elijah N
e
wren
strma
p
:
take
ad
v
a
ntage of
FLEX
P
TR_ALLOC_STR when
r
el
e
vant
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
Elijah Newren
s
t
rmap:
e
nable alloc
a
tions to come
f
rom a mem
_
pool
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-06
El
i
jah N
e
wr
e
n
s
t
rmap: add
a
strset sub-type
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-06
Elijah Newren
s
t
rmap:
split creat
e
_entry
(
) o
u
t
of strma
p
_put()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-05
E
l
ijah Newren
strm
a
p
: add functions faci
l
itating use as a s
t
ring
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-05
E
l
i
j
ah
N
e
wren
strmap: enable faster clear
i
n
g and re
u
s
i
ng of strmaps
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-05
Elijah Newren
strmap: ad
d
more
u
t
ility functions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-03
Elijah Newren
me
r
ge,rebase,reve
r
t
:
sel
e
ct ort or
r
ecu
r
sive by c
o
nfig
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-02
E
lijah Newren
str
m
ap: new utility functio
n
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-02
Elijah Newren
has
h
map
:
provide
d
eallocation function
names
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-02
Elijah
Ne
w
ren
hashmap: introduce a new hashmap_partial
_
c
lear()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-02
El
i
j
ah Newren
h
a
shmap: allo
w
re-
u
se after hashmap_
f
ree()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-02
E
lijah Newren
hashm
a
p:
adj
u
st spacing to fix
a
r
gume
n
t alignment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-29
Elijah Newren
f
a
st-re
b
ase: demonstr
a
te merge-or
t
's API v
i
a new test
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-27
Elijah Newren
mer
g
e-ort-wr
a
ppers: new convience wrappers to mimic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-27
E
lijah Newren
merge-
o
rt: ba
r
ebones
A
P
I
of n
e
w
merge strategy
w
ith
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-13
Elij
a
h
N
ewren
hashm
a
p: add usage
d
ocumentat
i
on explaining hashmap_f
r
ee
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-19
Elijah Newren
dir: fix pro
b
lematic
A
P
I to avoid
memory l
e
aks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-19
Elijah
Newren
d
i
r: make clear_
d
irectory(
)
fre
e
all
r
elevant me
m
ory
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-18
Eli
j
a
h
Newren
mem-p
o
o
l
: use consi
s
tent po
o
l variable na
m
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-18
Elija
h
Newren
me
m
-pool: use mo
r
e standa
r
d init
i
a
l
ization
a
n
d
finalization
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-18
Elijah
N
ewre
n
mem-pool: add
co
n
ven
i
ence functions for s
t
rdup and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-14
Elijah Newren
seque
n
cer: avoid
g
arbled me
r
ge ma
c
hinery messages due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-12
El
i
jah
Newren
dir:
a
void prematurely m
a
rkin
g
nonbare reposit
o
ries
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-12
Elija
h
N
e
wren
t3000: fix
some test description t
y
pos
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
Eli
j
a
h
Newren
t
6425: be more flexible with
r
ename/delete
c
onf
l
ict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
Elijah Newren
t642[23]:
b
e more fle
x
ible for add/add
c
onflict
s
in
v
olving
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
Elijah Newren
t6422
,
t6426: be more f
l
exible for add/add con
f
licts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
Elij
a
h Ne
w
ren
t64
2
3:
a
dd an
e
xplanat
i
on about
w
h
y on
e
of
the tests
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
E
l
i
jah Newren
t6416, t6423:
c
larify
s
ome comments and fix some typos
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
E
lijah Ne
w
ren
t
6
4
22: fix multiple errors wit
h
the
mod6 test expecta
t
ions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
Eli
j
a
h
Newren
t64
2
3: fix te
s
t setup fo
r
a c
o
uple tests
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
El
i
jah Newren
t
6
41
6
, t6422: fix in
c
orrect
un
t
racked file co
u
nt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
Elijah
Newre
n
t6422:
fix
b
ad che
c
k against
m
i
s
s
ing fil
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
Elijah Newren
t6418: tighten delete/
n
o
rmali
z
e
conflic
t
testcase
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
Elijah Newren
Collect
m
erge-r
e
la
t
ed tests to
t64xx
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-03
Elij
a
h Newren
c
h
eckout:
s
upport renorma
l
ization with ch
e
c
k
out -m
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-03
Elija
h
Ne
w
ren
merge: make merge
.
renormalize work for all u
s
e
s
o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-03
E
l
ijah Newr
e
n
t6
0
38: remove prob
l
e
m
at
i
c test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-03
Elijah Newre
n
t60
3
8: make
t
es
t
s fail for the
r
ight
r
ea
s
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-02
Elijah Newren
me
r
ge-recursi
v
e:
f
ix unclear and outright w
r
ong comme
n
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-07-28
Elijah New
r
en
ha
s
hmap: fix typo i
n
u
sa
g
e
d
ocs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-07-28
E
lijah Newren
Remove doubl
e
d
w
ords in variou
s
comm
e
n
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-22
Elijah Newren
git-prompt
:
include sp
a
rsity
state as
well
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-22
Elija
h
Newren
git-pr
o
mpt: document how in-p
r
ogress operati
o
ns affect
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-18
El
i
jah N
e
wren
wt-st
a
tus: show sparse checkout status
a
s
well
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-13
El
i
jah Newren
cl
e
a
n
: optimiz
e
and
d
ocument case
s
where we recurse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-13
Elijah New
r
en
clean: consoli
d
at
e
h
a
ndling of ignor
e
d parameters
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-13
Elijah Newr
e
n
dir, clean:
a
void disallow
e
d be
h
avi
o
r
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-13
E
l
i
ja
h
Newre
n
di
r
:
fix a few confusing co
m
ment
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-13
Elija
h
Ne
w
r
e
n
git-sparse
-
checko
u
t: clar
i
fy inte
r
actions with submodu
l
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-05
Elij
a
h
New
r
en
dir
:
fix treatmen
t
of negated pat
h
specs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-05
Elijah Newren
spa
r
se-
c
heckout: avoid staging deletions of al
l
f
i
les
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-05-31
Elijah Newr
e
n
fast-
i
m
p
ort: ad
d
new --date-format=raw-per
m
issive fo
r
mat
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-05-15
Elijah Newren
unpack-trees: also
allow get_pr
o
g
r
ess() to
work on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-05-14
Eli
j
ah N
e
wren
merge-recursi
v
e
:
fix re
n
ame/rename(1to2) for wo
r
k
in
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-27
Eli
j
ah Newren
rebase: display
a
n
e
rror
if -
-
r
o
ot
a
n
d --fork-poi
n
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-11
E
lijah Newren
rebase: fix an incompatibl
e
-op
t
ions error message
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-11
Elijah
N
ewren
rebase: reinstate --no-keep
-
e
mpty
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-11
E
lijah Newren
rebase -i: mark co
m
mi
t
s that begi
n
empty
in t
o
d
o ed
i
tor
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-07
Eli
j
ah
Newren
s
equenc
e
r: honor
G
IT_R
E
FLOG_ACTION
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-05
E
lijah Newren
git-reba
s
e
.
t
xt: ad
d
ano
t
her
h
o
o
k
to the hooks section
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elijah
Newren
com
p
let
i
on: fix 'git add' o
n
paths
u
nder an u
n
tracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
E
l
ijah New
r
en
Fix err
o
r-
p
rone
f
il
l
_directo
r
y() AP
I
; ma
k
e it on
l
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elijah Newren
dir: replace d
o
ub
l
e
p
at
h
spec matching with si
n
g
le in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elijah Newren
dir:
i
n
clude
DIR
_
KEEP_UNTRACK
E
D_CONTENTS han
d
ling
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elijah Newren
dir: rep
l
ace exponential algorithm with a
l
inea
r
one
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Eli
j
ah Newren
d
ir: fix confusion based
o
n
variable
t
ense
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elijah
New
r
en
dir: fix broken comm
e
n
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elijah Newren
dir
:
con
s
olidate treat_pa
t
h(
)
a
n
d
treat_on
e
_path()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elij
a
h Newre
n
dir: fix simple t
y
po in c
o
mment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elijah Newren
t300
0
: add
m
o
re testcases testing a varie
t
y
o
f ls-
f
i
les
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elijah Newre
n
t7063: mo
r
e t
h
oro
u
gh st
a
tu
s
checking
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newr
e
n
pull: avoid
runn
i
n
g both merge an
d
r
e
ba
s
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elijah N
e
w
r
en
sparse-check
o
ut: p
r
ovide a new reapply subcommand
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
unpack-tre
e
s
:
f
ailure to s
e
t SKIP_WORKTREE bits always
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
un
p
a
ck-trees: p
r
ovide
warnin
g
s on
s
parse
u
p
d
a
t
e
s for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
un
p
a
c
k-t
r
ees: make spar
s
e
pa
t
h messages sound li
k
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
u
npack-trees: split display_error_msgs() into two
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elijah N
e
wren
unpack-trees
:
rename ERR
O
R
_* fields
mean
t
for w
a
rnings
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
El
i
jah
Newren
unpack
-
tr
e
es: m
o
v
e ERRO
R
_
WOULD_LOSE_SUBMODULE ea
r
lier
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elij
a
h Newren
sparse-check
o
ut
:
use
improve
d
unpack_trees po
r
celain
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elijah N
e
wren
s
parse-ch
e
ckout:
u
s
e new u
p
date_spa
r
s
i
t
y() f
u
nct
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
u
npack-trees: add a
new upda
t
e_spar
s
ity() f
u
nction
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
E
li
j
ah Newren
unpack-trees: p
u
ll sparse-ch
e
c
k
out pa
t
te
r
n re
a
d
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
unpac
k
-
trees: do not m
a
rk a dirty
path with SKIP_WORKTREE
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
El
i
jah Newren
unpack-t
r
ees:
allow
c
heck_updat
e
s() t
o
work on a different
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
El
i
jah Newr
e
n
t109
1
: m
a
ke some
tests a
l
i
t
tle mo
r
e de
f
ensive aga
i
nst
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
El
i
jah Newren
unpack-trees: sim
p
lify pa
t
t
ern_l
i
st fr
e
eing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next