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 Ne
w
ren
t6020, t6022, t
6
035: u
p
dat
e
merge tests
t
o
us
e
test
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-27
Elijah Newren
t602[
1
236], t60
3
4: modernize test form
a
tting
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-01-02
Elijah
Newren
merge-recu
r
sive: remove unnecessary
o
i
d_eq function
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-20
Elijah Ne
w
ren
re
b
ase: fix saving of --signoff state for am-based
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-19
Elijah Newren
dir: consolidate
simila
r
c
o
de i
n
t
r
eat
_
dire
c
tory()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-19
El
i
jah New
r
en
di
r
: syn
c
hr
o
nize
t
reat
_
l
eading_path
(
) and read_directory
_
rec
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-19
Elijah Newren
dir: fix checks o
n
common prefix di
r
ecto
r
y
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-18
Elijah Newren
t3434: mark succes
s
fu
l
t
est as such
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-11
E
l
ijah
N
ewr
e
n
d
i
r
: break part of read_director
y
_r
e
cursive() out for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-11
Elijah Newren
dir:
exit before wil
d
car
d
fall-through if th
e
re is
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-11
Elij
a
h Newren
di
r
:
r
emove stray qu
o
te character in comm
e
n
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-11
Elijah N
e
wren
Revert "dir
.
c
:
m
ake
'
git-status
-
-
i
gno
r
e
d
'
w
ork wit
h
in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-11
Elijah Newren
t
3011: demonstrate
directory tr
a
v
e
r
s
a
l failur
e
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
E
lijah New
r
en
Fix spell
i
ng errors in no
-
longer-updated-from-u
p
stream
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elijah
N
ewren
mu
l
timail
:
fi
x
a few
sim
p
le spe
l
li
n
g errors
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Eli
j
ah Newren
sha1dc: fix
t
r
i
vial comment spe
l
ling err
o
r
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newre
n
Fix spelling errors in test comma
n
ds
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elija
h
Newre
n
F
ix sp
e
l
l
ing err
o
rs in mes
s
ages sho
w
n
t
o
users
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
E
l
ijah Newren
Fix spelling err
o
rs in nam
e
s of tests
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elijah N
e
wren
F
i
x spelling error
s
i
n
comment
s
o
f
te
s
tcases
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newren
Fix
s
p
e
lling error
s
in code comments
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
Elij
a
h N
e
wren
t
6
024: moderni
z
e
style
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
Elijah N
e
wr
e
n
n
ame-has
h
.
c
:
remove duplic
a
te w
o
rd in comment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
Elijah Newr
e
n
has
h
map: f
i
x
d
ocumentation m
i
suses o
f
-> versus
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
E
l
ij
a
h Ne
w
ren
gi
t
-f
i
lter-branch
.
txt: correct
a
rgument name typo
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
Elijah Newren
Fix s
p
elling errors
in
d
ocumentation outside of Document
a
ti
o
n
/
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
Elijah Newren
Do
c
umenta
t
ion:
fix
a bunch of
t
y
p
o
s, both old and
n
ew
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-02
Elijah Newre
n
RelNotes/
2
.
24
.
0: fix
self-c
o
n
t
radictory
n
o
te
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-02
E
lijah Newren
RelNotes/2
.
24
.
0: typofix
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-23
E
lijah Newren
t604[236]: do not run s
e
t
u
p
i
n
separate tests
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-23
E
lijah N
e
w
re
n
m
erg
e
-recursive: fix m
e
rging a s
u
bdi
r
e
ctory into the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-23
E
lij
a
h Ne
w
r
en
me
r
ge-recu
r
sive: clean up get_r
e
named
_
dir_portion()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-08
Elijah N
e
w
ren
m
e
rg
e
-
recur
s
ive: fix the fix
to the
d
i
ff3
common a
n
c
e
stor
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Elij
a
h Newren
fast-ex
p
ort: handle ne
s
t
ed tags
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Eli
j
ah
New
r
en
t
9
350: add tests for tags of
t
hings other than a commi
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fa
s
t-ex
p
ort:
a
llow
u
ser to
request tag
s
be
mark
e
d with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Elijah
Ne
w
ren
fas
t
-export: add support for --imp
o
rt-marks-if-exists
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-import: a
d
d support for new 'alias' c
o
mmand
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fa
s
t-import: allow tags t
o
be
i
de
n
tified by ma
r
k labe
l
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Eli
j
ah
Newren
fast-imp
o
rt: fix handling
o
f d
e
l
eted ta
g
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
merge
-
r
ecursive: fix the
diff3 com
m
on ancestor label
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newr
e
n
di
r
:
s
peci
a
l
case chec
k
for
the
po
s
s
i
bility that pathspe
c
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-28
Elijah Newren
f
ast-exp
o
rt: fix ex
p
orti
n
g a tag and
n
ot
h
ing else
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
c
l
ean: f
i
x
theoretical path
c
orruption
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
clean:
rew
r
ap overl
y
l
o
ng line
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
E
l
i
j
ah
Ne
w
ren
clean: avoid re
m
oving untr
a
ck
e
d files in a nested git
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
cl
e
an:
disambi
g
uate t
h
e definit
i
on of -d
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
git-
c
lean
.
txt:
do not claim we will delete f
i
les with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elij
a
h N
e
wr
e
n
dir: add comm
e
ntar
y
e
xplaining match_pa
t
hspec_item
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah N
e
wren
d
i
r: if our
pa
t
h
spec mi
g
ht match fi
l
e
s
under a dir
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah
Newren
dir: make the DO_
M
AT
C
H_SU
B
MODULE
c
ode reusa
b
le for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah New
r
en
dir: also check directories
f
o
r
m
a
t
ching pathspecs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
d
ir: fix off-by-on
e
erro
r
in match_pathspec_item
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
New
r
e
n
d
ir: fix
typo in
c
omme
n
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
t7300: add testcases showing failure to cl
e
an
spec
i
fied
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newren
t990
2
: us
e
a n
o
n-deprecated
command
f
or test
i
ng
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
Elij
a
h Newre
n
Recommend git-fi
l
ter-
r
epo instead of git-fi
l
t
e
r-
b
ra
n
ch
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
Elijah
N
ewren
t6006: si
m
plify, fix, and optimize e
m
pty
message t
e
st
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
Eli
j
ah N
e
wren
t
3427:
a
cc
e
lerate this t
e
st
by using fast-expo
r
t and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-01
Elijah Newren
merge-opti
o
ns
.
t
x
t: clarif
y
m
e
aning
of various
ff-re
l
ated
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h N
e
wren
me
r
g
e
-recu
r
sive: alph
a
betize
include li
s
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-r
e
cursive: ad
d
sanity checks for re
l
evant merg
e
_o
p
tions
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
l
i
jah
Newren
merge-re
c
u
rsive: rename MERGE
_
R
E
CURSIVE_* to MERGE_
V
AR
I
ANT_*
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Newren
merge-recursive: split int
e
r
n
al fields into a separate
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newr
e
n
m
erge-re
c
ursive:
avoid
l
osin
g
o
u
tput and leaking mem
o
ry
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
e
rge-recurs
i
ve: comment and reorder the merge_opti
o
n
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
wren
m
erge-recursi
v
e: consolidate unnecessary fields in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Newren
merge-recursive: move some
d
efinit
i
o
n
s
around t
o
clean
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ewren
merge-
r
ecu
r
si
v
e: rename merge_options argument to opt
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah New
r
en
me
r
ge
-
recur
s
ive:
rename 'mrtree' to 'result_
t
ree',
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Newren
me
r
ge-rec
u
rsive: use commo
n
name
for ancestor
s
/common
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah New
r
en
m
e
rge-re
c
ur
s
ive: fix some overly long lines
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Ne
w
ren
cache-tree:
s
hare cod
e
between function
s
writing an
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
l
i
j
ah Newren
merge-recursive: don't force external callers to do
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Newren
merge-recur
s
ive: r
e
m
ove u
s
el
e
ss parameter in merge_trees()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Newren
m
e
r
g
e
-recu
r
s
i
ve: exit ea
r
ly if index
!
=
head
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
e
wren
Ensure index matches h
e
ad before i
n
vok
i
n
g merge machinery
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Newren
merge-r
e
cursive: remove another implicit
depen
d
e
n
cy
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
a
h Newren
m
e
rge
-
rec
u
rsi
v
e: future-proof update_
f
i
le
_
flags() a
g
ainst
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merg
e
-recursive: provide a bet
t
er
label for d
i
ff3 common
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-16
E
l
ijah
N
ewren
merge-recursive: enforce opt->ances
t
o
r
!= NU
L
L
when
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-16
E
lijah
Newren
ch
e
ck
o
ut: pr
o
vide better conflict hunk description
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newre
n
m
e
rge-recu
r
sive: be
c
onsistent with assert
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-16
E
lijah Newren
check
o
ut: remove d
u
pl
i
cate code
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-12
E
l
ijah Newren
g
i
t-fast-import
.
t
xt: clarify that multiple
merge commits
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-06
Elijah Newren
merge-rec
u
rs
i
v
e
: avoid directory ren
a
me
detect
i
o
n in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-06-05
El
i
jah
Newren
merg
e
-rec
u
r
s
ive: r
e
s
t
ore accidentally droppe
d
setti
n
g
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-05-14
Elij
a
h N
e
wren
f
ast-ex
p
o
rt: d
o
automatic r
e
encod
i
ng of commit messages
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-05-14
El
i
ja
h
New
r
e
n
fast-export: dif
f
erentiate betw
e
en explicitly UTF-8
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-05-14
E
lij
a
h Newre
n
f
a
st-export: avoid stri
p
pin
g
enco
d
i
ng header if we
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-05-14
Elijah
N
ew
r
en
fast-im
p
ort:
s
upp
o
rt 'enco
d
ing
'
co
m
mit header
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-05-14
E
lij
a
h
Ne
w
ren
t9350: fi
x
encoding test to
actually te
s
t reencoding
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-26
Elijah
Newren
Honor core
.
p
r
ecompose
U
nico
d
e
in more place
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
Newren
merg
e
-re
c
u
r
si
v
e
: switc
h
directory rename detection
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
ah Newren
m
e
rge-recursive:
g
i
ve callers of h
a
n
dle_
c
onten
t
_
m
erge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newre
n
merge-re
c
ursive: track information asso
c
iated with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
t60
4
3:
f
ix copied test d
e
scription to match its purpose
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-recu
r
sive: switch from
(oid,m
o
d
e
)
p
ai
r
s
to a
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Ne
w
ren
me
r
ge-rec
u
rsive: cl
e
anu
p
h
andle_rename_* func
t
io
n
signatures
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
El
i
j
a
h
Newr
e
n
merge-recursive:
track branc
h
wher
e
rename oc
c
u
rre
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next