repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Git 2.25.2
2020-02-19
Elijah
Ne
w
ren
mer
g
e-recursive
:
fix the refr
e
sh logic
i
n u
p
date_fi
l
e_
f
lags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-19
Elijah Newren
t3433: new reba
s
e te
s
tcas
e
do
c
umenting a sta
t
-dir
t
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-18
Elijah
Newren
check
-
ignore: fix documentati
o
n and im
p
l
e
menta
t
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-01-16
Elijah New
r
en
dir: t
r
eat_leading_path() and read_di
r
e
c
t
o
ry_recursiv
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-01-07
El
i
jah New
r
en
string-
l
ist: note
i
n do
c
s that ca
l
ler
s
can speci
f
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-01-07
Elijah Newren
unpack-trees:
exit
ch
e
ck_updates() ea
r
l
y
i
f updates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-01-02
E
l
ijah Newren
merge-re
c
ursive: remove
unnece
s
sary oid_eq func
t
i
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-20
Elij
a
h Newren
rebase: fix sav
i
ng of --signof
f
stat
e
for am-
b
ased
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-19
Elija
h
Newren
dir: c
o
nso
l
idate s
i
milar code
in tre
a
t_directory()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-19
Elijah N
e
w
ren
dir: synchronize tre
a
t_
l
eading_path() and r
e
ad_dir
e
ctory_rec
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-19
Eli
j
ah Newre
n
di
r
:
fix chec
k
s on common prefix direct
o
ry
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-18
El
i
jah
N
e
w
ren
t3434: mark succ
e
s
s
ful t
e
st as such
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
Elij
a
h Newren
dir: break part of
read_dire
c
tor
y
_recursiv
e
() out for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
Elijah Ne
w
r
en
dir: exit before wildcar
d
fall-through if there is
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
Elijah Newren
di
r
: remo
v
e stray quo
t
e character in co
m
ment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
Elijah Newren
Revert "dir
.
c: mak
e
'git-status --ignored'
work within
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
E
lijah
N
ewren
t30
1
1: demonstr
a
t
e di
r
ecto
r
y tr
a
v
ersal failures
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Ne
w
ren
Fix spelling errors in no-long
e
r-
u
p
d
ated-fro
m
-upstream
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elija
h
Newr
e
n
multima
i
l:
f
ix a few
s
imple spelling errors
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
El
i
j
a
h Newren
sha1dc: fix trivial com
m
ent sp
e
lling error
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elijah
N
ewren
F
i
x
spelling erro
r
s in t
e
st com
m
ands
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
E
l
ijah New
r
e
n
Fix
s
p
e
lling er
r
ors in mess
a
ges shown to users
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
E
l
ijah
N
ewren
F
i
x
spelling er
r
ors in names o
f
te
s
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elijah N
e
wren
Fix spell
i
n
g
e
r
ror
s
i
n comments of testc
a
ses
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Eli
j
ah Newren
Fi
x
s
pellin
g
errors in co
d
e
comments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
E
lijah
N
ewren
t6024: mode
r
niz
e
style
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
El
i
jah
N
e
wre
n
name-h
a
sh
.
c
:
remove du
p
l
i
c
ate
wo
r
d
in
comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
E
lijah
N
ewren
h
ashmap:
fix documen
t
at
i
on m
i
s
uses of ->
v
ersus
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Elija
h
N
e
wr
e
n
gi
t
-fi
l
t
e
r-branch
.
txt: cor
r
ect argument
n
ame typ
o
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Elijah Newren
Fix s
p
elling err
o
rs
in
d
ocu
m
entation ou
t
side of Documentatio
n
/
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Eli
j
ah Newren
Docume
n
tat
i
on: fix a
b
u
n
ch
o
f typos, both old and new
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
El
i
jah Newr
e
n
RelNotes/2
.
24
.
0: fix self-contradict
o
r
y note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
Elijah Newren
RelNotes/2
.
24
.
0: typofix
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elijah New
r
e
n
t6
0
4[236]: do
n
o
t
r
u
n s
e
t
u
p
in
s
e
parate tests
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elija
h
New
r
e
n
merge-re
c
ursiv
e
: fix mer
g
ing a subdi
r
ectory into the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Eli
j
ah Newren
merg
e
-recursive: clean
u
p get_renamed_dir_p
o
rtion()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-08
E
l
ijah Newre
n
m
erge
-
recu
r
sive: fix the fix to the
d
iff3 commo
n
an
c
estor
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elija
h
Newren
fa
s
t-ex
p
or
t
: handle nes
t
e
d
t
ags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Eli
j
ah
N
ewren
t9
3
50: add tests
for
tags of things other than a com
m
it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Eli
j
ah Newren
fast-ex
p
ort: allow use
r
to request tags be marked with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newr
e
n
fast-export: add support for --impor
t
-marks
-
if-exists
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
El
i
j
a
h
Ne
w
ren
fast-import:
a
dd support for new
'
alias
'
c
o
mman
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah New
r
en
f
a
st-impor
t
:
all
o
w tags to
be ide
n
ti
f
ied by mark labels
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah N
e
wr
e
n
fast-import: f
i
x ha
n
dling
of deleted tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
El
i
jah Newren
merge-re
c
ursive: fix
the diff3 commo
n
an
c
estor label
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
dir: special c
a
se check for the pos
s
ibility th
a
t pathspec
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-28
Elijah Newren
fast-
e
xport:
fi
x
expo
r
ting a
tag
a
nd
nothing e
l
se
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
Newre
n
clean:
f
ix theoretical path corru
p
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
N
e
wre
n
cl
e
an: rewrap o
v
erly lo
n
g line
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
El
i
j
a
h Newre
n
cl
e
a
n
: avo
i
d removing untracked files in a nested git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
Newren
clea
n
: dis
a
mbigu
a
t
e
the
d
efinitio
n
of -d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
El
i
jah Newren
g
it
-
clean
.
txt: do no
t
cl
a
i
m
we will
d
e
l
et
e
files
w
it
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir: add co
m
mentary expla
i
ning m
a
tch_pathspec_item
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
ah
N
ewren
dir
:
if our pathspec
m
ight match files under a
d
i
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
El
i
jah Newren
dir
:
make the DO_MATCH_S
U
BMODU
L
E c
o
de reusable
f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir: also check
directori
e
s for ma
t
ching
pathspecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
ah
Newren
dir
:
fix
off-
b
y
-one
e
rror in match_pathspec_item
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah New
r
e
n
dir: fix typo
i
n comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newr
e
n
t
7300: add testcases
s
howing failure to cl
e
an sp
e
c
i
f
i
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
E
l
ijah Newren
t9902: u
s
e a non-
d
e
p
r
ecated command f
o
r test
i
ng
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elij
a
h New
r
en
Recomme
n
d git-filter-repo instead o
f
gi
t
-f
i
lter-branch
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elija
h
Ne
w
ren
t
6006: simplify, fix, a
n
d
optimize e
m
p
ty message t
e
st
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah New
r
en
t3427: acce
l
e
rate
t
his tes
t
by using fa
s
t-export and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-01
Elij
a
h N
e
wr
e
n
merge-o
p
tions
.
t
x
t
:
cl
a
rify m
e
a
n
ing o
f
v
arious ff-r
e
late
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah New
r
en
merge-recurs
i
v
e
: alphab
e
tize in
c
lud
e
list
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newr
e
n
mer
g
e
-recursive: add sanit
y
checks for relevant merge_o
p
tion
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Newr
e
n
merge-
r
ecursive: rename MERGE_RECURSIVE_* to
MERGE_VARIANT
_
*
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newr
e
n
mer
g
e
-
recursive: sp
l
it inter
n
al fi
e
lds into
a
separate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
m
e
r
g
e-recu
r
sive: avoid losing output and leaki
n
g memory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
erge-re
c
ursiv
e
: comment a
n
d reorder the mer
g
e_
o
ptions
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
wren
me
r
ge
-
recursive: consolidat
e
unnec
e
ssa
r
y fiel
d
s
i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Ne
w
r
en
me
r
g
e-recursive: move some definiti
o
n
s around to
c
lean
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-r
e
cursive: rename merge_optio
n
s
argument to opt
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive: rename
'
mrtree' to
'
resul
t
_
tre
e
',
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
w
r
en
merge-recursive: use common name
for ancestors/common
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lij
a
h
Ne
w
re
n
m
erge-recursive: fi
x
s
o
m
e overly l
o
ng
li
n
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
c
a
che
-
tree: shar
e
code betw
e
en functions
w
riting a
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newr
e
n
merge
-
recursive:
don't for
c
e external callers
to
d
o
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah New
r
en
merge-recursi
v
e:
remov
e
usel
e
ss param
e
te
r
in merge
_
trees
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newr
e
n
merge-recursive: exit ear
l
y if index != head
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
Ensure
index matches head
befo
r
e invoking merge machine
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newren
m
erge-recursive: remove
another
i
mplicit depe
n
den
c
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-rec
u
r
s
ive
:
future-proof
u
p
date
_
file_flags
(
)
agains
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Newren
merge-
r
ecursive: provide a better
l
abel f
o
r d
i
ff3 common
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newren
mer
g
e-recursiv
e
:
enforce opt->a
n
cestor != NULL wh
e
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
E
l
i
jah Newren
check
o
ut: provide better confl
i
ct hunk
d
esc
r
i
p
tion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newren
merge
-
recursive
:
be co
n
sis
t
ent
w
ith assert
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
E
l
ijah
N
e
wren
checkout: remove duplic
a
te code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-12
Elijah Newren
gi
t
-fast
-
i
mport
.
txt: cla
r
ify
t
hat mul
t
iple
m
er
g
e co
m
mits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-06
El
i
jah Ne
w
r
en
merge-recursive: avoid di
r
ectory rename
detection in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-06-05
Elijah Ne
w
ren
merge-
r
ecur
s
ive
:
restore accidentally dropp
e
d
s
etting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
fast-export: do autom
a
tic reencoding of commit messag
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elij
a
h Newren
fast-export: differentiate betwe
e
n
ex
p
licitly UTF-8
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah
N
ew
r
en
fast-ex
p
ort: a
v
oi
d
strip
p
i
n
g encoding header if we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elij
a
h
N
ewr
e
n
fast-import: suppor
t
'encoding'
c
o
m
m
it header
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
El
i
j
a
h Newr
e
n
t9350: fix encoding test to
actuall
y
test
r
eencoding
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-26
Elijah N
e
wren
Honor core
.
pr
e
compos
e
U
nicode i
n
more places
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
m
e
rge-
r
ecursive: switch
d
irectory
rename detect
i
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
m
erge-recur
s
ive: give calle
r
s
o
f ha
n
dl
e
_co
n
ten
t
_mer
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
ah New
r
en
merge-re
c
ursive: track informa
t
ion asso
c
iated with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next