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
t6020, t6022, t6035: update merge tests to use test helper functions
2020-02-27
Elijah Newren
t602
0
, t6022, t60
3
5: update me
r
ge te
s
ts to
u
se tes
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-27
El
i
j
a
h
N
ewren
t602[1236]
,
t6034: modernize test formatting
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-01-02
Eli
j
ah Newr
e
n
merge
-
recursive
:
remove unnecess
a
r
y
oid
_
eq function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-20
Elijah
N
e
wren
rebase: f
i
x sav
i
ng
o
f
--sig
n
o
f
f
state for am
-
b
as
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-19
Elijah Newren
d
ir: conso
l
idate
simil
a
r
code in
treat_
d
irector
y
()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-19
Elijah Ne
w
ren
d
ir:
s
ynchronize
treat_
l
eading_path() and read_directo
r
y_rec
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-19
Elijah Newr
e
n
dir: fix chec
k
s on com
m
on
p
r
e
fix direct
o
ry
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-18
Elijah Ne
w
r
en
t343
4
: mark s
u
c
cessful te
s
t
a
s such
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
E
l
ijah Ne
w
ren
dir: break part of r
e
ad_direc
t
o
ry_recursive() out f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
Elijah Newren
d
ir
:
exit before wi
l
dcard f
a
l
l
-through
if
there is
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
Elijah Newren
dir: remove stray quote character in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
Elijah Newren
Re
v
ert
"di
r
.
c: make 'g
i
t-status --
i
gnored' work within
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
Elijah Newren
t
3011
:
demons
t
rate d
i
recto
r
y
trav
e
rsal failures
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newren
Fix s
p
elling e
r
ror
s
in
no-longe
r
-up
d
ated-from-upstream
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
El
i
jah Newren
mult
i
ma
i
l: fix a few
sim
p
le spelling errors
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Ne
w
ren
sha
1
dc: fix tr
i
vial comment
s
pelling
erro
r
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
E
lijah Newren
Fi
x
sp
e
lling erro
r
s in test com
m
a
n
ds
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
E
l
ijah
N
ewre
n
F
i
x
s
p
elling
e
rrors i
n
m
e
ssag
e
s s
h
own to u
s
ers
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newren
Fi
x
spelling errors in nam
e
s of tests
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newren
F
ix spel
l
i
n
g
errors
in c
o
m
me
n
ts of
t
est
c
a
s
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newre
n
Fix spell
i
ng
e
rrors in code comments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Elij
a
h
Ne
w
re
n
t6024:
m
odernize styl
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Elijah Newren
name-
h
a
s
h
.
c: remove duplic
a
t
e word in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
E
lijah New
r
en
hashmap: fix do
c
ument
a
tion misuses of ->
versus
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
E
l
ijah Newr
e
n
git-filte
r
-branch
.
txt: c
o
rrect argument na
m
e typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Eli
j
ah Newren
Fi
x
spel
l
i
n
g errors in docu
m
e
n
tation ou
t
si
d
e of
D
ocumentati
o
n/
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Elijah N
e
wren
Do
c
um
e
ntation:
f
ix a bunch of typos, both old and new
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
Elijah Newren
RelNotes/2
.
24
.
0: fix self
-
cont
r
a
dictory note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
Elijah Newren
RelNotes/2
.
24
.
0:
typofi
x
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elijah N
e
w
ren
t604[236]: d
o
not run
s
etup i
n
separate test
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
E
l
ija
h
Newren
m
e
rge-recursive: fix merging a subdire
c
t
o
ry into the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elijah Newren
merge-recursive: clean up get
_
renamed_dir_portion()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-08
Elijah Newren
merge-recursive:
f
ix the fix
t
o
t
he diff3 com
m
on
a
nc
e
stor
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-exp
o
rt:
h
andle nested tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newre
n
t93
5
0: add tests for
tags of
things
o
ther than a com
m
i
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
l
ijah Newren
fast-exp
o
rt: a
l
lo
w
us
e
r to re
q
uest tags
be m
a
rked
w
ith
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elij
a
h
N
ewren
fast-export: add support for
-
-import-marks-if-exi
s
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
l
ijah Newren
fast-impor
t
:
a
dd s
u
pport for new 'al
i
as' comman
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
l
ij
a
h Newren
f
a
st-impo
r
t:
allow tag
s
to be identified b
y
mark labels
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-
i
mport: fix handling of deleted tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Eli
j
ah Ne
w
re
n
merg
e
-recursiv
e
: fix the
d
iff3 com
m
on ancest
o
r label
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newr
e
n
dir: special case check for the pos
s
i
b
il
i
ty t
h
at paths
p
ec
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-28
Elij
a
h Newren
f
ast-export: fix
expo
r
ting a tag a
n
d
n
o
t
h
i
n
g
else
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah Newren
clean: fix theoretical path corr
u
ption
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah Newren
clean: r
e
wrap over
l
y long line
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah New
r
en
clean: avo
i
d
r
emoving
unt
r
ac
k
e
d
files in a nested git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
lijah
N
ewren
clean: disambiguat
e
the definit
i
on of
-
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
N
ew
r
e
n
git-
c
lean
.
txt: do not clai
m
we will delete
file
s
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
lijah
Newr
e
n
dir: ad
d
commentary explai
n
ing match_pa
t
hsp
e
c_item
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
di
r
: if ou
r
pa
t
hsp
e
c might match
f
i
l
es under a dir
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
d
i
r: make the DO_MATCH_SUBM
O
DUL
E
code reusable for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir:
a
ls
o
check
directories for matching
p
aths
p
ecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
Ne
w
r
e
n
dir: fix off
-
b
y-one er
r
or in match_path
s
pe
c
_item
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir:
fix typo in commen
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah New
r
en
t7300: add tes
t
cases show
i
n
g
fa
i
lure to clean s
p
ecified
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
E
lijah Newr
e
n
t9
9
02: use a non-deprecat
e
d command fo
r
testing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah N
e
wren
Re
c
o
m
men
d
g
i
t-fi
l
ter-repo in
s
tead
o
f git-filter-branch
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
E
lij
a
h Newren
t
60
0
6: simplify, f
i
x
, and optimize empty messag
e
t
est
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Ne
w
ren
t
3427: accelera
t
e
th
i
s test by usin
g
f
ast-export and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-01
El
i
j
ah
Newren
merge-options
.
txt
:
clarify me
a
ning of
v
a
r
io
u
s ff-related
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newre
n
mer
g
e
-recursive: a
l
phabe
t
ize
i
nc
l
ud
e
list
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-re
c
ursive: add sanity
checks for
r
e
leva
n
t merge_option
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge
-
r
e
curs
i
ve: rename M
E
RGE_RECURSIVE_* to MERGE_VARI
A
N
T
_
*
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Ne
w
ren
merge-re
c
ursive: spli
t
internal fields into a separate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Ne
w
ren
merge-
r
ecursive:
a
void losing out
p
u
t and leaking memory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Ne
w
ren
m
e
rge-recursive: comment an
d
re
o
rder the merge_op
t
ions
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h N
e
wren
me
r
ge-re
c
u
r
sive: co
n
solidate
unnecessary fields in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ija
h
Newren
merge-recursive:
move
s
o
me definitions around to clean
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursiv
e
: r
e
name merge_
o
ptions argume
n
t to opt
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Newren
merge-
r
ecurs
i
ve: rename '
m
r
tr
e
e' to
'result_tr
e
e',
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive: use com
m
on name
for ances
t
or
s
/
common
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Newren
merge-r
e
cu
r
sive: fix s
o
me o
v
erly
l
o
ng lines
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newr
e
n
cache-tree: share
c
ode between fun
c
tions writ
i
ng an
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
i
jah Newr
e
n
merge-recur
s
ive: don't for
c
e external callers to d
o
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h
N
e
wren
mer
g
e-recursive: r
e
move useless paramete
r
in merg
e
_t
r
ees()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
wren
merge-recursi
v
e
: exit early
if
i
n
dex !=
h
ead
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Ne
w
ren
Ensure
i
n
dex matches head before i
n
voking
merge machinery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h
N
ewren
me
r
ge-recursive: remove another implicit dep
e
n
d
ency
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
w
r
e
n
me
r
ge-rec
u
rsive: fut
u
r
e
-proof updat
e
_fil
e
_flags() against
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newren
merge
-
rec
u
r
s
ive: provide a b
e
t
t
er label for diff3
c
om
m
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elij
a
h Newren
m
e
r
ge-recursive: enforce opt->ancestor
!
= NULL when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah New
r
en
check
o
u
t
:
provide be
t
ter
conflic
t
h
u
nk description
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
E
lijah Ne
w
ren
merge-recur
s
ive: be consistent with asse
r
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah New
r
en
checkout: rem
o
v
e duplicate
c
ode
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-12
El
i
jah Newren
git-fast-import
.
txt: clar
i
fy tha
t
m
u
ltiple m
e
rge commits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-06
Elija
h
Newren
merge-r
e
cursive:
a
v
o
id directory rename detect
i
on in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-06-05
Eli
j
ah
Newren
merge-recursi
v
e: res
t
o
re a
c
cident
a
lly dropped setting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah N
e
wr
e
n
fast-export: do aut
o
matic reencodi
n
g of comm
i
t m
e
ssages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
lija
h
Newren
fast-
e
xport: dif
f
erentiate between explicitly UTF-8
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
l
ijah
Newren
f
a
st
-
expor
t
: avoid
s
tripping encodin
g
header
i
f we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Eli
j
a
h Newren
fa
s
t-import:
s
u
pport
'en
c
oding'
commit header
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
t9350: fix enco
d
ing test to
actually
t
est reencoding
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-26
Elija
h
New
r
en
Honor core
.
precomposeUnicode in mo
r
e plac
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah Newren
merge-recursive
:
switch directory
rename detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newre
n
m
erge
-
recursive: give
c
allers
o
f
handle_co
n
tent_merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
l
ijah Newren
merge
-
re
c
ursive: tr
a
c
k
informatio
n
as
s
ociated with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
t604
3
:
fix copied test description to mat
c
h its pur
p
ose
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elij
a
h
N
ewren
merg
e
-recursi
v
e
:
switch from (oi
d
,mode) pairs t
o
a
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-recur
s
i
v
e: c
l
eanup
h
andle_rename_* f
u
nction signat
u
res
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merg
e
-recursive: track branch where rename occ
u
r
red
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next