repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'js/use-test-tool-on-path'
2019-12-20
Elijah Newren
re
b
ase: fix
saving
of --signoff
stat
e
for
a
m-based
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-19
Elijah Newren
dir: consolidate simi
l
ar code in t
r
eat_dire
c
tory()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-19
E
lijah Newren
dir: s
y
n
chronize
treat
_
leading_pat
h
() and re
a
d_dir
e
cto
r
y
_r
e
c
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-19
E
l
ijah Newren
d
i
r:
f
ix c
h
ecks on common
p
refix direc
t
ory
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-18
El
i
jah New
r
e
n
t3434: mar
k
successful test as such
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
Elijah Ne
w
r
en
dir: br
e
ak
pa
r
t of re
a
d_direct
o
ry_recurs
i
ve() out for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
E
lijah Newren
dir:
e
x
i
t before wildc
a
rd
f
all-through if there is
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
Elijah N
e
w
r
e
n
dir: remove str
a
y quote character in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
Elijah New
r
en
Reve
r
t "dir
.
c: make '
g
it-s
t
atus --ignored' wor
k
w
ithin
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
El
i
j
a
h Newren
t3011: d
e
monstrate
d
irector
y
tra
v
ers
a
l failures
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newren
Fix spe
l
ling e
r
rors in no-longer-updated-fr
o
m-upstream
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
E
li
j
a
h Newr
e
n
multimail: fix a few simple spelling errors
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elij
a
h
N
ewren
s
h
a1dc:
f
ix tri
v
i
al comment spellin
g
error
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Ne
w
ren
Fix spel
l
i
ng
e
rror
s
in test comman
d
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newre
n
Fix spelling err
o
rs
i
n
messages sho
w
n to users
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
El
i
jah
N
ewren
Fix spelli
n
g errors in nam
e
s of t
e
sts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newren
Fix s
p
elling errors in comment
s
of
testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newren
Fix spell
i
ng er
r
ors in code comments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
E
lijah
N
ewren
t6024: mode
r
niz
e
s
tyle
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Elijah N
e
wren
name-hash
.
c: remove duplicate w
o
rd i
n
c
o
m
m
e
nt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Elij
a
h Newren
hashmap: f
i
x
d
ocumentation
m
i
suses of
-
>
versus
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
E
l
ijah Newren
git-filter-branch
.
txt: co
r
rect argum
e
nt n
a
me
t
ypo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
E
l
ijah N
e
wren
Fix sp
e
lling erro
r
s i
n
documentation o
u
tside of Documentat
i
on/
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Elija
h
Newren
D
o
c
umentation:
f
i
x
a bunch of
typo
s
, both old and
n
ew
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
Elijah
N
ewren
RelNotes/2
.
24
.
0
:
fix self-contradictory note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
Elijah
N
ewren
RelNot
e
s/2
.
24
.
0:
t
ypofix
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
El
i
jah Ne
w
ren
t6
0
4[236
]
: do no
t
run s
e
t
up in separate te
s
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
E
lijah Newren
m
erge-recursive: fi
x
merging a subdirec
t
ory into the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elijah Newren
merge-re
c
u
rsi
v
e: clean
u
p
g
et_renamed_dir_portion()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-08
E
lij
a
h Newren
m
e
r
g
e
-recursive
:
fix the fix to the diff
3
commo
n
ance
s
tor
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah N
e
wren
fast-expo
r
t: han
d
l
e
n
e
sted tag
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah
N
ewren
t9
3
50: add
t
ests for tags
o
f things other t
h
a
n a commit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
lijah Newr
e
n
fast-export
:
a
l
low us
e
r to request tags be
marke
d
wit
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Ne
w
r
en
fast-exp
o
rt: ad
d
s
uppor
t
f
o
r --imp
o
rt-marks-if-exi
s
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-import:
a
d
d supp
o
rt for new '
a
lias' c
o
m
m
and
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-import: allow tag
s
to be identified by ma
r
k labels
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elija
h
Newre
n
fast-import: fix han
d
l
i
n
g of del
e
ted t
a
gs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newr
e
n
merg
e
-recursive: fix the diff3
common
ances
t
or
l
abel
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
dir: special cas
e
check for the p
o
ssibility that pathspec
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-28
Elijah Newre
n
fast-exp
o
rt: fix exporting a tag an
d
nothing else
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ija
h
Newren
c
lean: f
i
x theoretical path co
r
ruption
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
clean: rewrap ov
e
rly long
l
ine
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
clean: avo
i
d removing untracked fi
l
es
in a nested git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
N
e
w
r
en
clean:
di
s
ambiguate the definition o
f
-
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Ne
w
ren
git-clean
.
txt: do
not cl
a
im w
e
will
delete files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
El
i
jah Newren
dir:
a
dd c
o
mme
n
tary explaining match_pathspec_
i
t
e
m
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
ah New
r
en
dir: if our pa
t
hspec
m
ight ma
t
ch files
under
a dir
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
N
ewren
dir:
m
ake th
e
DO_MATCH_SUBMODULE code
reusable
f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newr
e
n
dir:
also check
d
irectories for
m
a
tc
h
ing
p
at
h
spec
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah Newren
d
ir: fix off-by-o
n
e erro
r
in match_pathspec_item
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
d
ir: fi
x
t
ypo in commen
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elij
a
h Newren
t7300: add test
c
ases s
h
o
wing failure
t
o clean spec
i
fied
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
E
l
ija
h
Newren
t9902:
u
se a
non-deprecated
com
m
and for testin
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah New
r
en
Recommend git-f
i
lter-r
e
po instead of git-filte
r
-b
r
anch
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
El
i
jah Newren
t6006: simplify,
fix, and o
p
timize em
p
ty me
s
s
age test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
El
i
jah Newren
t3427
:
accelerate th
i
s
tes
t
by usin
g
fast-expor
t
an
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-01
E
l
ijah Newren
m
er
g
e-
o
ption
s
.
txt:
clarify meaning of v
a
rious ff-related
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Newren
merge-recursive:
a
lph
a
betize
i
nclude list
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Ne
w
re
n
m
erg
e
-recursive: add sanity checks for rel
e
v
ant
m
erge
_
options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
me
r
g
e-recursiv
e
:
r
e
n
ame MERGE_R
E
CURSIVE_* to MERGE_VARIA
N
T_*
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newr
e
n
merg
e
-re
c
u
rsive:
s
pl
i
t internal fields into a separate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h Newr
e
n
mer
g
e-r
e
cursive: avoid losin
g
output and
leak
i
ng memory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-
r
ecu
r
s
i
ve: comment a
n
d
reorder th
e
merge_options
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive:
c
onsoli
d
a
te
u
n
necessary
fields in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h
Newre
n
merge-recursive: move
s
ome d
e
f
i
nitions a
r
ound to clean
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ewren
m
e
rge-recur
s
ive: rename me
r
ge_opti
o
ns argu
m
ent to
opt
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive: rena
m
e 'mrtr
e
e' to '
r
esult_tree
'
,
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newre
n
merge-recursive:
use common
n
a
me for anc
e
stors/
c
o
m
mon
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Newren
merge-recursive: fix some overly long l
i
nes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newre
n
cache-tree:
s
h
a
re c
o
de betwee
n
functions writing
a
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
mer
g
e-recursive: d
o
n't for
c
e
exter
n
al callers to do
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge
-
r
e
cursi
v
e:
remove useless parameter in
merge_tr
e
es(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive: exit early if ind
e
x != head
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
Ens
u
re
i
nde
x
matches head befor
e
in
v
oking merge machinery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah
Newren
merge-recursive: remove another
i
m
p
licit dependency
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah New
r
en
merge-recur
s
ive: future-
p
roof update_
f
ile_f
l
a
gs(
)
against
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive: provide a better label for diff
3
common
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
El
i
j
a
h
N
ewren
merge-recursive: enforc
e
o
p
t
->anc
e
st
o
r !=
NULL when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newren
c
h
eckout: provide b
e
tter con
f
lic
t
h
u
nk descrip
t
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elij
a
h Newren
m
erge-recu
r
s
i
ve:
be consistent with assert
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah
Newre
n
checkou
t
: rem
o
ve duplicat
e
code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-12
Elijah Newren
git-fa
s
t-import
.
txt: clar
i
fy that multip
l
e merge
commi
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-06
El
i
j
a
h
Newren
m
erge-recu
r
s
ive: avoid directory
r
ename detection in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-06-05
Elijah Newren
m
erg
e
-recursi
v
e: re
s
tore
accidentally
d
ropped
s
etting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elij
a
h N
e
wre
n
f
ast-expor
t
: do
a
utomatic re
e
ncoding of com
m
it
m
e
ssages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
fast
-
export: differentiate between
e
xplicitly UTF-8
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah N
e
w
ren
fast-expo
r
t:
a
void s
t
ripping e
n
coding he
a
de
r
if we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
l
ijah New
r
e
n
fast-import: s
u
pp
o
rt 'encoding
'
commit header
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elij
a
h Newren
t9
3
50: fix enco
d
ing test to actually test reencoding
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-26
Eli
j
ah Newr
e
n
Honor core
.
pre
c
o
mposeUnic
o
de in m
o
re places
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
l
i
j
ah Newren
merge-r
e
cursive: sw
i
tch direc
t
ory rename dete
c
tion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
Newren
merge-rec
u
rsive: give callers of handle_cont
e
nt_merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
a
h
Newren
merge-recur
s
ive: trac
k
inf
o
rma
t
ion associ
a
te
d
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elija
h
Newren
t
6
043: fix co
p
ied test
d
e
s
crip
t
io
n
to
m
atch
i
t
s p
u
r
pose
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
m
erge-r
e
c
u
rsive: switch from (oid
,
mo
d
e)
pairs to a
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newr
e
n
m
e
rge-re
c
ursive: cleanup
h
an
d
le_renam
e
_* function signatures
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
El
i
j
a
h Newren
merge-recu
r
sive: tr
a
ck
b
ranch wher
e
ren
a
m
e
occ
u
rred
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merg
e
-recu
r
sive: r
e
move re
n
[
1
2]_other fiel
d
s
f
rom rename_con
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
m
erge-
r
ecursi
v
e: shrink re
n
ame_conflic
t
_info
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Ne
w
r
e
n
m
e
r
ge-
r
ecursive: mov
e
some struct
d
eclara
t
i
o
ns together
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next