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
setup.h: move declarations for setup.c functions from cache.h
2023-03-21
Elija
h
Newren
setup
.
h
:
m
o
ve declarations for setup
.
c functions from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-03-21
Elijah New
r
en
treew
i
de
:
remove cache
.
h in
c
lusion due to envir
o
n
m
ent
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-03-21
E
lijah Newr
e
n
envi
r
onment
.
h:
m
o
v
e declarations for environme
n
t
.
c
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-03-21
E
li
j
a
h
Newren
treewide: remove unnecessar
y
inclu
d
es of cache
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-03-21
Eli
j
ah Newr
e
n
wrap
p
e
r
.
h: move declarations
f
o
r wrapper
.
c functions
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-03-21
Elija
h
Newr
e
n
path
.
h: move function
declarations for path
.
c
functions
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-03-21
Elijah N
e
w
ren
cache
.
h: r
e
move
e
xp
a
nd_user_pat
h
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-03-21
E
l
ijah Newren
abspat
h
.
h
: move
abs
o
lu
t
e path functions from
c
ach
e
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-03-21
Elijah N
e
wren
enviro
n
m
ent: mo
v
e c
o
mment_line_cha
r
from cache
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-03-21
Eli
j
a
h
Newren
t
reewide: remove un
n
ecessary
cach
e
.
h inclu
s
ion fr
o
m
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-03-21
Elijah Newr
e
n
treewide: remove unnecessary inclusio
n
of get
t
ext
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-03-21
Elij
a
h Ne
w
ren
treewide: be e
x
plicit
ab
o
ut dependence o
n
gett
e
xt
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-03-21
Elij
a
h N
e
wren
treewide: remove unnecessa
r
y
c
ache
.
h
inclusi
o
n
f
rom
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah New
r
en
unpack-trees
:
a
dd usage notices
a
ro
u
nd df_conflict_entry
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah Newren
unpack
-
tr
e
e
s: special case read
-
tr
e
e debugging as internal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elija
h
Newre
n
u
npack
-
trees:
r
e
w
rap a few overlong lines fr
o
m previous
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elij
a
h Newren
unpack-tr
e
es
:
m
a
rk
fields only used internally as i
n
te
r
n
a
l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Eli
j
ah New
r
en
u
npack
_
t
rees: s
t
ar
t
splitting i
n
terna
l
fields
f
r
om
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
E
lijah Newren
s
p
arse-ch
e
ckou
t
: avoid using in
t
e
r
nal API of unpack
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah
N
ewren
sp
a
rse
-
checko
u
t: avoid using internal API of unpack
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah
Ne
w
r
en
u
n
pack-tr
e
es: clean up some flow control
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah Newren
di
r
:
m
ark
output only fields
of dir
_
struct
as such
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
E
l
ijah
Newren
dir:
a
dd a us
a
ge note to exclude_pe
r
_dir
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah Newren
dir: separate pub
l
i
c
f
r
o
m
inte
r
nal portion of dir_
s
truct
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
E
lijah
N
ewren
unpack-trees: heed reque
s
ts to over
w
r
i
t
e ign
o
red files
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
El
i
jah Newren
t2021:
f
ix platfo
r
m-spe
c
ific lefto
v
er cruft
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elija
h
N
e
wren
diff
.
h: remove u
n
n
e
cessary include of o
b
j
e
ct
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Eli
j
ah Newren
Remove unnecessa
r
y in
c
lud
e
s
of
builtin
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elijah New
r
en
t
reewide: replace cache
.
h with more direct headers
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elijah Newren
rep
l
ace-o
b
j
ect
.
h:
m
ov
e
read_repla
c
e_r
e
f
s
declarati
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elijah Newren
obj
e
c
t-store
.
h: move str
u
ct
objec
t
_info fr
o
m cache
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elijah Newren
dir
.
h: refactor
t
o
n
o lon
g
er need to inclu
d
e cache
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elijah N
e
wren
object
.
h: s
t
op dependin
g
on cache
.
h; ma
k
e cache
.
h
depen
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elijah Newren
id
e
nt
.
h:
m
ove ident-related
de
c
l
a
rations ou
t
of cache
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elijah Ne
w
ren
pretty
.
h: mov
e
has_non_ascii() declara
t
i
on from co
m
mit
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elijah Newren
cache
.
h: remo
v
e dependenc
e
o
n
h
e
x
.
h; make other
files
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elijah Newren
hex
.
h: move some hex-r
e
l
a
t
ed declarations from
c
a
c
he
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elija
h
N
e
wren
hash
.
h: move some oid-
r
elat
e
d declarations from cache
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elijah N
e
wren
all
o
c
.
h: mo
v
e
ALLOC_GROW() func
t
ions fro
m
cach
e
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elijah Newre
n
treewid
e
: re
m
ove
unne
c
essary cache
.
h
incl
u
d
e
s in sou
r
ce
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
E
l
ijah Newren
treewide: remove un
n
ecess
a
ry c
a
che
.
h includ
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Eli
j
ah
N
ewren
tr
e
e
w
ide: remove unnecessary git-com
p
at-util
.
h inclu
d
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elija
h
Newren
tr
e
e
w
ide: e
n
sure one of the appropriate
headers is
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-09
Elijah Newren
nam
e
-rev: fix names by drop
p
ing tag
g
erdate workaroun
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newren
reb
a
s
e: provide better error me
s
sage for app
l
y option
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newren
rebas
e
:
put rebase
_
o
ptions initialization in sing
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
E
l
ijah Newren
reb
a
se: f
i
x formatt
i
ng of rebase --reapply-c
h
erry
-
picks
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Ne
w
ren
r
ebase: clarif
y
the OPT_CMDMODE incompatibiliti
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elij
a
h
Newren
rebase:
a
dd coverage
o
f other
i
nc
o
m
p
atible options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah
N
ewren
rebase: fix incompatibl
i
ty
c
hecks for -
-
[no-]reapp
l
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newren
rebas
e
: fix docs
about i
n
compatibilities wi
t
h
-
-root
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah
Newren
rebas
e
: remove --al
l
ow
-
em
p
t
y-message from incom
p
atible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newren
rebase: flag --apply and --merg
e
as inc
o
m
p
ati
b
le
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
E
lijah New
r
e
n
rebase: mark --upda
t
e-ref
s
a
s
requiring the merge
b
ackend
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-15
Elijah Newren
t6426: fix TO
D
O abo
u
t making
t
est more comprehensive
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-13
Elijah Newr
e
n
l
s-files:
g
u
i
de
folks to --
e
xc
l
ude-st
a
ndard ove
r
other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-13
Elij
a
h Newren
ls-files: clarif
y
descriptions
of status tags f
o
r -t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-13
Elijah Newren
ls-files:
clari
f
y descr
i
ptions of file selectio
n
op
t
ion
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-13
El
i
jah Newren
ls-fil
e
s
:
a
dd missing doc
u
mentation for --res
o
lve-undo
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-11-07
Elija
h
Newre
n
s
parse-chec
k
out
.
t
x
t
: n
e
w
document with sparse-che
c
kou
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-10-23
Elijah Newren
m
e
r
g
e
-tree: support m
u
ltiple batch
e
d merge
s
with -
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-10-23
Eli
j
ah Newren
merge-tree: upd
a
te document
a
tion for di
f
f
e
rences in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-10-22
E
l
ijah N
e
w
r
en
m
erg
e
-or
t
: fix bu
g
with dir rename vs change dir to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-09-02
Elijah Newr
e
n
diff: fi
x
filterin
g
of merge commits u
n
der --remerge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-09-02
El
i
jah Newren
diff: fix filtering of additi
o
nal
h
eaders under --remerge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-09-02
Elijah N
e
w
r
en
diff: ha
v
e submodule_fo
r
mat logic
a
void additi
o
n
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-26
Eli
j
ah N
e
wren
t
6
4xx: convert 'te
s
t
_
crea
t
e
_
repo' to 'git ini
t
'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
Elijah Newre
n
t4301: add more
interesting merge-tree te
s
tcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
Elijah Newren
m
e
r
g
e: s
m
all code readability
improvement
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
Elijah
New
r
en
merge: cleanup confus
i
ng logic for ha
n
dli
n
g s
u
ccessful
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
El
i
jah Newren
merge
:
o
n
ly a
p
ply aut
o
stash when
a
ppropriate
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-19
Elijah
Ne
w
ren
revision: al
l
ow --ancestry-pa
t
h to take
a
n ar
g
u
ment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-19
E
l
i
jah Newren
r
ev-list-options
.
txt: fix simple
typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-19
Elijah Newren
merge-ort: re
m
ov
e
c
o
de obsoleted
by other chan
g
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
Elijah Newre
n
merg
e
-o
r
t: provid
e
helpful submodule up
d
ate message
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
Elijah N
e
wren
merge-ort: av
o
id
s
urpri
s
e with new sub_flag variable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
Elijah Newren
m
erg
e
-ort: remove
t
r
a
nslator lego in ne
w
"submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
m
e
rg
e
: do
not e
x
it restore_state() prematurely
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elij
a
h
New
r
en
merge: ensure we can act
u
a
lly res
t
ore
pre-merge sta
t
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
merge: make r
e
s
t
ore_state() r
e
store sta
g
ed state too
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Eli
j
ah Newren
merge: f
i
x
s
a
ve_stat
e
() to wor
k
w
hen the
r
e are stat
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
m
e
rge
:
do not abort
e
arly if one s
t
rategy fails
t
o
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah
Newren
m
e
rge: abort if
i
n
dex does not match HEAD for trivi
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Ne
w
ren
m
erge-re
s
olve: abort if inde
x
d
o
e
s not match
HE
A
D
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
El
i
jah
Newren
merge-o
r
t-wrappers: make prin
t
e
d message match
t
he
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Newren
mer
g
e-ort: fix i
s
sue
w
ith dual rename and add/add
c
o
n
f
li
c
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elij
a
h
New
r
e
n
merge-ort: shuffl
e
the computation and cl
e
anup of po
t
ential
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah
N
ewre
n
merge-ort: make a sepa
r
ate fun
c
t
ion for fre
e
ing
s
truct
.
.
.
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-07-06
E
lija
h
Newre
n
me
r
ge-ort: smal
l
cleanups of che
c
k_f
o
r_
d
i
r
ectory_rename
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-07-06
E
lijah Newren
t
6
42
3
: a
d
d tests of dual di
r
ectory
rename plus add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-01
Elijah
Newren
t6429: fix use of
non-e
x
istent
function
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newre
n
git-
m
erge-
t
ree
.
txt: a
d
d a secti
o
n on
poten
t
ional usage
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
El
i
jah Ne
w
r
en
merge-
t
ree:
add a
-
-
allow-unrelated-histories f
l
ag
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-tree: allo
w
`ls
-
f
iles -u` styl
e
inf
o
to
be NUL
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah N
e
w
r
en
me
r
ge-
o
r
t: o
p
t
i
o
n
ally produce mach
i
ne-r
e
adable output
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elij
a
h Newren
merg
e
-ort: store m
o
re s
p
e
c
i
fic co
n
flict info
r
mation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-tr
e
e: provide easy
a
ccess to
`ls-files -u
`
style
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newre
n
merge-tree:
provide a list of whic
h
files have conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Eli
j
ah New
r
en
merge-ort: rem
o
ve
command
-
line-centric submodule message
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
l
ijah N
e
wren
merge-ort: provide
a mer
g
e_get_conflicte
d
_files() helper
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next