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
t: mark several submodule merging tests as fixed under merge-ort
2020-12-13
Elijah Newr
e
n
merge-ort: add a path_confl
i
ct f
i
eld t
o
merge_opt
i
ons_i
n
ternal
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah N
e
wren
mer
g
e-ort:
add a cle
a
r_
i
n
ternal_opts helper
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-o
r
t: add a few includes
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Ne
w
ren
merge-or
t
: fre
e
data str
u
ctures in merge_finaliz
e
()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-13
El
i
jah Ne
w
ren
merge-ort: add im
p
leme
n
tation of re
c
o
rd_conflicte
d
_index_ent
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-13
E
lijah Ne
w
ren
tree: en
a
b
le cmp_
c
ache_nam
e
_
c
omp
a
re() to
b
e used
elsewh
e
re
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-o
r
t: ad
d
i
m
p
l
eme
n
tati
o
n
o
f c
h
e
ckout()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge
-
ort:
ba
s
ic
outline for
m
erge_sw
i
tch_to_resul
t
()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ijah Newren
m
e
r
ge-ort:
s
tep 3
of tree writing -- handling
subdirect
o
ries
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-or
t
: step
2
of tree writi
n
g -
-
f
unction to create
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
N
ewren
merge-o
r
t: step 1 of tree writing -- record
b
asenames
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newr
e
n
merge
-
or
t
: have p
r
ocess_entries operate in
a
defined
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Newren
merge-ort: add a preliminary si
m
p
le process_entries
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
N
e
w
ren
m
e
rge-
o
rt:
a
void rec
u
rsing into id
e
ntic
a
l trees
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h Newren
merge
-
ort: record stage
a
nd a
u
xi
l
iary info for every
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
Newren
m
e
rge-ort: co
m
pute a few more u
s
eful fields for co
l
le
c
t_
m
e
r
g
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
N
ewren
merge-ort: avoid r
e
p
eati
n
g fill_tree_descript
o
r() on
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elija
h
Ne
w
re
n
merge-ort:
impl
e
ment a very bas
i
c collect_merge_
i
nfo()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elij
a
h
N
ewren
m
e
rge-ort: add an err() functio
n
similar t
o
one from
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah
N
ewren
merge-o
r
t: use histogram diff
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newr
e
n
merge-o
r
t
:
port merge_start() from merge-recursive
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-13
Elijah Newren
merge-
o
rt:
a
dd so
m
e
h
i
gh-level algorithm
s
truc
t
ure
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-13
E
l
ijah
Newr
e
n
merge-ort:
setup bas
i
c interna
l
data str
u
ctures
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-01
E
lijah Newre
n
stash:
f
i
x st
a
sh application in spa
r
se-checko
u
ts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-01
Eli
j
ah Newren
stash: remove unnecessa
r
y process
f
o
rking
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-12-01
Elijah Newr
e
n
t7012:
add a testc
a
se dem
o
nstrating stash apply bu
g
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-11-11
E
lijah Newren
shortlog: use
strset fr
o
m strmap
.
h
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-11-11
E
l
ijah Newren
Use
n
e
w HASHMAP_
I
NIT macro t
o
simplify hashmap in
i
tializati
o
n
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-11-11
Elijah Newren
strmap:
take advan
t
age of FLEXPTR_ALLOC_S
T
R
when relevant
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-11-11
Elijah Newren
s
t
rma
p
: enab
l
e all
o
catio
n
s
t
o come f
r
om a mem_pool
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-11-06
E
lij
a
h Newr
e
n
strmap: add a strse
t
sub-type
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-11-06
Elijah N
e
wr
e
n
st
r
map: split create_entry()
out of strmap_
p
ut()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-11-05
E
l
ijah Newren
strmap: add functions faci
l
itating use as a string
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-11-05
E
lijah N
e
wr
e
n
strmap: ena
b
l
e
f
ast
e
r
clea
r
ing and reusing of strmaps
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-11-05
El
i
jah
N
ewre
n
strmap:
add mo
r
e ut
i
lity
f
unctions
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-11-03
Elijah Newren
m
e
rg
e
,re
b
ase,rev
e
rt: select ort
or recursive by
c
onfig
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-11-02
Elijah Newren
str
m
ap: n
e
w
utility f
u
n
ction
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-11-02
E
lijah N
e
wren
hashmap: provide deallocation function
names
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-11-02
Elijah Newren
hashmap: i
n
troduce a new has
h
m
ap_partial_clear()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-11-02
Elij
a
h Newren
hashmap
:
a
l
low re-
u
se after
has
h
map_
f
r
ee()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-11-02
Eli
j
ah
Newr
e
n
hashma
p
: adjust spacin
g
to
fix
a
rgum
e
n
t
a
lignment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-29
Elijah Newren
fast-
r
ebase: demonstrate
mer
g
e-ort's API
v
i
a
new te
s
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-27
El
i
jah
N
ewren
merg
e
-ort-wr
a
pp
e
rs: new
co
n
vience wrappers t
o
mimic
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-27
E
l
ijah
Newren
m
erge-or
t
: barebones API o
f
new mer
g
e str
a
te
g
y
w
ith
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-26
Elijah N
e
wren
t6
4
23: add more details abo
u
t
d
i
r
ect resolution of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-26
E
lijah Newren
t6
4
23: note improved
o
rt han
d
ling with untracked files
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-26
E
l
ijah Newren
t6423
,
t6436: n
o
te improved or
t
hand
l
ing
with d
i
rty
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-26
Eli
j
ah N
e
wren
merge tests: expect slight differe
n
c
es in
o
u
t
put for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-26
Elijah
Newr
e
n
t6
4
2
3: expect
imp
r
oved conflict mar
k
ers lab
e
ls in
the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-26
Elijah N
e
w
ren
t
640
4
,
t6423
:
expect imp
r
o
v
ed rename
/
delet
e
hand
l
ing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-26
Elijah Newre
n
t6416: correct expectation for rename
/
rename(1
t
o2)
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-26
El
i
jah Newren
merge tests: expect imp
r
oved directory/fil
e
c
onflict
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-26
Elija
h
Ne
w
ren
t/:
new helper for tests that pass with ort
b
ut fail
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-21
Elijah Newren
s
e
q
uencer: remove
duplicate
rollback_l
o
ck_file() call
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-18
Elijah N
e
wren
test-lib: reduce
ve
r
bosity of skipped tests
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-18
Elijah Newren
t6006,
t
6012: adjust tests to use '
s
etup' instead of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-18
Elijah Newr
e
n
test-lib: all
o
w se
l
e
cting tes
t
s
by
s
u
b
s
t
r
i
ng/
g
lob with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-18
Elijah Newren
t
7
5
18: f
i
x flaky grep invocatio
n
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-16
Elij
a
h
Newren
t6423: more involved rules
f
or renam
i
ng directori
e
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-16
E
lijah N
e
w
r
en
t64
2
3
:
update directory rename detection te
s
ts with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-16
Elijah Newren
t6423: more
involved
d
irectory rename
t
es
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-16
E
l
ija
h
Newren
directory-rename-dete
c
tio
n
.
txt: upd
a
t
e
ref
e
rences to
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-13
Elija
h
N
e
wren
hashmap
:
add usage do
c
u
m
entation expl
a
ini
n
g hashmap_fre
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-19
E
lij
a
h Newr
e
n
dir: fi
x
problem
a
tic API to avoid memory lea
k
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-19
Eli
j
a
h Newren
di
r
: make clear_directory() f
r
ee all
r
elevant memory
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-18
E
l
ijah Newren
mem-po
o
l
: use
consistent
p
ool variab
l
e
name
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-18
El
i
jah Newren
mem-poo
l
: use mo
r
e
standar
d
in
i
tialization and finalization
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-18
Elijah
N
e
w
r
en
mem
-
pool: add
convenienc
e
functions for
strdup
an
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-14
E
l
ijah Newren
sequencer: avoid garb
l
ed m
e
rge
m
achinery messages due
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-12
E
l
ijah Newr
e
n
dir: avoid prematurely
m
arking
n
onbare
r
e
p
osi
t
o
ries
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-12
Elijah Ne
w
ren
t3000: fix some test descr
i
ption typos
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elijah Newren
t6425: be mor
e
flexible w
i
th
r
enam
e
/
d
e
l
et
e
co
n
flict
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elijah N
e
wren
t6
4
2[23]: be more fle
x
i
b
le for add/
a
dd conflicts i
n
vol
v
ing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
E
l
ijah Newren
t6422, t
6
426
:
b
e
m
o
re flexible f
o
r add/add conf
l
ic
t
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elijah Newren
t64
2
3: add an
ex
p
l
a
nation about w
h
y o
n
e o
f
the tests
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
E
l
ijah Newren
t6416, t6423:
clarify some comments and fix some
t
ypos
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elijah N
e
wren
t
6
422: fix
multipl
e
err
o
rs w
i
th the mo
d
6
test expectations
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elija
h
Newren
t6423: fix test setup
for a cou
p
le tests
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elijah
New
r
e
n
t6416, t6422:
fix incorrect untracked
file count
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
El
i
jah
Newren
t6422: f
i
x
b
ad
chec
k
against
missin
g
f
ile
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elijah Newr
e
n
t
6418: tight
e
n dele
t
e/
n
ormal
i
ze co
n
flict testcase
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elij
a
h New
r
en
Collect
m
e
r
ge-relate
d
tests to
t64xx
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-03
Elijah New
r
en
checkout: support renormalizatio
n
with
check
o
ut
-m
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-03
Elijah N
e
wren
m
e
rge: make me
r
g
e
.
renormalize
work
for all uses of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-03
Elija
h
Newren
t6038
:
remove problematic t
e
st
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-03
Elijah N
e
wren
t
6
0
3
8: ma
k
e tests
fail for the right r
e
ason
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-02
E
lijah
N
e
w
ren
merge-rec
u
rsive:
fix unclear and outrig
h
t
w
rong comments
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-07-28
El
i
jah Newre
n
hashmap: fix ty
p
o in usage docs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-07-28
Elijah Ne
w
ren
Remove d
o
ubled words i
n
various comme
n
ts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-22
Elijah Newre
n
g
it-p
r
o
m
pt:
i
nclude spar
s
ity state as well
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-22
Elijah Ne
w
ren
git-prompt: document how in-pr
o
gress opera
t
ions affect
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-18
E
l
ijah Newre
n
w
t-status: show sparse checkout
status as well
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-13
Elijah Newren
clean: optimize a
n
d document cas
e
s
w
h
e
re w
e
recurse
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-13
Elijah Newren
clean: consolidate handl
i
ng of ignore
d
parameters
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-13
El
i
jah
N
e
wr
e
n
dir
,
clean: avoid
disallo
w
ed behavior
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-13
Elija
h
Newren
dir: fix a few confusing comments
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-13
Eli
j
ah New
r
en
git
-
spar
s
e
-
checkout: clarify interactions with submodules
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-05
Elijah Newren
dir: fix
treatmen
t
of negate
d
pat
h
specs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-05
Elijah Newren
sparse-
c
h
eckout: a
v
o
i
d staging deletions of a
l
l files
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-05-31
E
lijah Newr
e
n
fast-import: add new
--da
t
e-forma
t
=raw-permissive form
a
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next