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: add a few includes
2020-12-13
Elija
h
Newren
mer
g
e
-
or
t
:
add a few in
c
ludes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort
:
f
r
ee data s
t
ructures in merge_finalize()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
li
j
a
h
Newren
merge
-
ort: add implementation of
record_conflicted_index_ent
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah N
e
wren
t
r
ee: enable c
m
p_cache_name_compare() to be used
e
lsewhe
r
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
Newren
mer
g
e-ort: ad
d
im
p
lem
e
ntat
i
o
n
of chec
k
out()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newr
e
n
m
e
rge-ort
:
basic outli
n
e fo
r
m
e
rge_switc
h
_
t
o_result()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: ste
p
3 of tree writing --
ha
n
dling subdirect
o
r
i
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Eli
j
ah
N
ewren
m
e
r
g
e-o
r
t: ste
p
2
of tree writing -- function to create
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merg
e
-ort:
step 1 of
tree writing -- record
basenames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
Newr
e
n
merge-o
r
t:
have process_entri
e
s operate
in a
defined
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Newren
me
r
ge-ort: add
a preli
m
inar
y
simple process_
e
nt
r
ies
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-
o
r
t
: avoid re
c
u
rsing into identi
c
al trees
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: record stage and a
u
xiliary info for every
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Ne
w
ren
merge-o
r
t: com
p
ute a fe
w
more usef
u
l fi
e
lds for co
l
lect
_
merg
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah N
e
wren
merge
-
o
rt: avo
i
d
repeating f
i
ll_tree_descri
p
tor() on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: implemen
t
a very ba
s
ic collect_merg
e
_info()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
El
i
jah Newren
merge-ort:
a
dd an err() fu
n
ction si
m
ilar to one f
r
om
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
E
lijah
N
ewren
m
e
r
ge-
o
rt: use histo
g
ram di
f
f
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h
Ne
w
ren
mer
g
e-ort: port merge_start() from merge-
r
ecursive
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-ort: ad
d
some hig
h
-level algo
r
it
h
m s
t
ructu
r
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-12-13
Eli
j
ah Newren
m
e
rge-ort:
se
t
u
p basic internal dat
a
struct
u
re
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
E
lijah
Newren
shortlog: use strs
e
t from strmap
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
El
i
jah Newren
Use new
HASHMAP_INIT macro to
s
impli
f
y
h
a
s
hmap i
n
it
i
alization
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
Elijah Newr
e
n
strmap: take
advanta
g
e of FLEXPTR
_
A
L
L
OC_STR when
relevant
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-11
Elijah Newr
e
n
s
tr
m
a
p
: en
a
ble allocations
t
o
come f
r
om a mem
_
p
o
ol
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-06
Elijah Ne
w
ren
strmap: add a strset su
b
-type
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-06
Elijah Newren
strmap: split cr
e
a
t
e_entry() out
of
s
trmap_put()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-05
E
lijah Newren
strm
a
p
: add functions
facilitating use as a string
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-05
Elija
h
N
ewren
strm
a
p: enabl
e
fas
t
er clearing and reusing
o
f s
t
rm
a
ps
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-05
Elijah Newre
n
strmap: add more
utilit
y
funct
i
ons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-03
E
li
j
ah
N
ewren
merge,rebas
e
,revert: sele
c
t ort or recursive by confi
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-02
Eli
j
a
h N
e
wren
str
m
a
p: new utili
t
y functions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-02
Elijah Newren
has
h
map: provide deallocation function na
m
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-02
El
i
j
ah Newren
hashmap: intro
d
uce a
n
ew hashmap_part
i
a
l_clear()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-02
El
i
jah Newren
ha
s
hmap: allo
w
re-use a
f
ter
h
a
shmap_f
r
ee()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-11-02
Elijah N
e
wren
hash
m
ap: a
d
just spacin
g
to f
i
x argument alig
n
men
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-29
Elijah Newren
f
a
st-
r
ebase: demons
t
r
ate merge-ort's API via n
e
w test
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-27
El
i
jah
Newren
me
r
ge-ort-wr
a
pp
e
rs: new convience wrap
p
e
rs to mimic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-27
E
lija
h
Newren
merge-ort:
b
are
b
one
s
A
PI of new merge strategy with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-10-13
E
l
ij
a
h
Newren
hashmap: a
d
d usage doc
u
m
entation explaining h
a
shmap_free
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-19
Elija
h
Newren
dir: fix problematic API to avoi
d
memory leaks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-19
Elija
h
Newren
dir: make
c
l
e
ar_directory() fre
e
all re
l
evant memory
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-18
Elijah
N
ewren
mem-p
o
ol: use con
s
istent pool variab
l
e name
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-18
Eli
j
ah Newren
mem-poo
l
: u
s
e mor
e
stan
d
a
rd initialization and fina
l
i
z
ation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-18
E
lija
h
Newren
mem-pool: ad
d
conveni
e
nc
e
f
unctions for
strdup and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-14
Elija
h
Newren
s
e
q
u
e
ncer: avo
i
d garbled merge machinery
messages d
u
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-12
El
i
j
ah Newr
e
n
di
r
: avo
i
d
p
remature
l
y
marking
n
onbare rep
o
s
i
tories
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-12
Elijah Newren
t3000
:
fix so
m
e test description typos
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
Elijah Newren
t6425: be mo
r
e
flex
i
ble with renam
e
/
d
e
lete
conf
l
ict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
E
lija
h
Newren
t642[23]: be more flexible for add/add conf
l
icts
in
v
olving
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
Elijah Ne
w
ren
t6422, t6426: be m
o
r
e
flexible for add/a
d
d conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
Elijah Newren
t64
2
3: ad
d
an explanat
i
on about w
h
y one of
the tests
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
Elijah Newr
e
n
t6416, t6423: clarify some comments and fix som
e
typos
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
E
lijah Newren
t6422: fix
m
ultiple errors with the
mod6 test
e
xpectations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
E
lijah
Newren
t6423: fix
test setup for a couple
t
e
sts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
Elijah Ne
w
re
n
t6416, t
6
422: fix
incor
r
ect untr
a
cked
f
ile count
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
Elijah N
e
wren
t6422: fix ba
d
check against missing file
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
Elij
a
h Newren
t6418: tighten delete/normali
z
e conflic
t
tes
t
c
a
se
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-10
Elij
a
h Newren
Collect m
e
rge-related tests to t
6
4xx
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-03
Elijah
N
ewren
che
c
kout: support renormalizatio
n
wit
h
checkout -m
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-03
Elijah
Newren
merge:
m
ake merge
.
r
eno
r
malize work for all uses of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-03
El
i
jah Newre
n
t6038: r
e
move problematic
t
est
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-03
Elijah Newren
t6038: m
a
ke tests fail for
the
right
r
easo
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-08-02
E
lijah
N
e
wren
merge-recur
s
ive: fix
u
n
clear and outrig
h
t wrong comment
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-07-28
Elija
h
Newren
hashm
a
p
: fix ty
p
o in usage d
o
cs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-07-28
Elija
h
Newren
Remo
v
e doubled w
o
rds
in
variou
s
comments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-22
Elijah Newren
git-
p
r
o
m
pt
:
include
s
p
arsity
s
tate
as well
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-22
Elijah Newren
git-
p
rompt
:
document how in-prog
r
ess op
e
rations
a
ffect
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-18
E
l
i
j
ah New
r
en
wt-status:
s
how spa
r
se chec
k
o
ut status as well
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-13
Elij
a
h Newren
clean: optimize and
d
ocum
e
nt case
s
wher
e
w
e recurse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-13
Elijah Ne
w
ren
clean: c
o
nsolidat
e
handl
i
ng
of ig
n
ored parame
t
ers
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-13
Elijah Newren
dir,
clea
n
: avoid
d
isallowed behavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-13
Elijah Newren
dir:
fi
x
a fe
w
confusing comments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-13
Elijah
Ne
w
ren
git-sparse-c
h
eck
o
ut:
cl
a
rify intera
c
tions with su
b
m
odul
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-05
Elijah Newren
d
ir
:
fix treatment of
n
egated pa
t
hspecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-06-05
Elijah Newren
sparse-checkout: avoid stagi
n
g d
e
letions
of all file
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-05-31
E
l
ijah Newren
fa
s
t-import: a
d
d
new
-
-date-f
o
r
m
at=
r
aw-permissive format
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-05-15
Elija
h
N
ewre
n
unpack-trees: also allow
g
et_progr
e
ss() to work on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-05-14
Elijah Newren
merge-re
c
u
r
sive
:
f
i
x rename/rena
m
e(1
t
o2) for
w
orki
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-27
El
i
jah Newren
re
b
ase:
d
isp
l
ay an error i
f
--root
a
nd --fork
-
point
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-11
E
l
i
jah
Newren
reb
a
s
e: f
i
x a
n
incompatib
l
e-o
p
tions error
me
s
sa
g
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-11
Elijah
N
ewren
rebase:
rein
s
tate --no-keep-
e
mpty
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-11
Elijah Newren
rebase
-
i
: mark commit
s
that begin empty in todo editor
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-07
Elijah
Newren
s
e
quencer: honor G
I
T
_REFLOG_ACTIO
N
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-05
El
i
j
ah
N
ewren
git-rebase
.
txt
:
add
a
noth
e
r hook to th
e
hooks se
c
tion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elijah Newren
com
p
letio
n
: fix 'gi
t
a
d
d' on paths under an un
t
racked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elija
h
Newren
F
i
x error-prone fill_dire
c
tory()
API; m
a
k
e
it
only
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elijah Newre
n
di
r
:
repl
a
ce double pathspec ma
t
ching with sin
g
le in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
E
lijah Newren
dir: i
n
clude DIR_KEEP_
U
NTRACKED_C
O
NTENTS handling in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
El
i
jah Newren
dir: rep
l
ace exponen
t
ial
a
lg
o
ri
t
hm with a
linear one
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
E
l
ija
h
N
ewren
dir: fix co
n
fusion b
a
sed on
variable tense
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elijah Newren
d
ir
:
fix broken comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elijah Newren
d
i
r
:
c
onsolidat
e
t
r
eat_
p
ath(
)
and treat_one_path()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elij
a
h
Newren
dir:
f
i
x
simple typo in co
m
ment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elijah Newren
t3000: add more testca
s
es testing a variety o
f
ls-files
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-04-01
Elijah N
e
wren
t7063: more
t
horough status checking
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elij
a
h Newren
pull: avoid r
u
nn
i
ng both merge and rebase
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elij
a
h Newren
sp
a
rse-ch
e
ckout: pr
o
vid
e
a new reapply subcommand
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
E
l
ijah Ne
w
ren
un
p
ack-trees:
fail
u
re to set
SKIP_W
O
RKTREE bits always
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-27
Elij
a
h Newren
unpack-tr
e
es: provide warnings on sparse up
d
ates for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next