repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
sparse-checkout: avoid using internal API of unpack-trees, take 2
2023-02-27
Elijah
N
ewren
spars
e
-checkout:
avoid using i
n
ternal API of u
n
pa
c
k
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
E
l
ijah Newren
sparse-checkout: avoid using interna
l
A
PI of unp
a
ck
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah Newren
unpack-trees: cle
a
n up some
f
low co
n
t
ro
l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
E
lijah
N
ewre
n
dir
:
mark ou
t
pu
t
on
l
y
fi
e
lds of
dir_struct as suc
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
E
lijah Ne
w
ren
dir: add
a
usag
e
note to
e
x
clude_per_dir
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah Newren
dir: separate public from
i
nternal p
o
r
t
ion of dir_struct
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah Newren
unpack-tre
e
s: h
e
ed requests to ove
r
writ
e
ig
n
or
e
d
file
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elija
h
New
r
en
t
2
021: fix platf
o
rm-specific l
e
ftover cruft
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-09
Elijah Newr
e
n
name-rev: f
i
x
n
ames
by dr
o
ppi
n
g ta
g
gerda
t
e workaround
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Eli
j
a
h
Newren
rebase:
p
rovid
e
b
etter erro
r
message for apply options
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elij
a
h
N
e
wren
rebase:
put rebase_options i
n
itia
l
i
z
ation in s
i
n
g
le
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newren
rebase:
f
ix
f
ormatting
o
f rebase --reapply-cherry-picks
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newr
e
n
rebas
e
: cl
a
rif
y
the O
P
T_CMDMODE inco
m
pa
t
ibilities
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newren
rebase:
a
dd covera
g
e
of o
t
her incompat
i
ble options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Ne
w
ren
rebas
e
:
fix
i
ncompatiblity checks for
--[no-]reapp
l
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah N
e
wren
rebase: fix docs about incompa
t
ibiliti
e
s
w
ith --roo
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elij
a
h Newren
rebase: r
e
move
--allow-empty-mes
s
age from incompatible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newren
reb
a
se: f
l
ag --a
p
p
ly and --merg
e
as i
n
compatible
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah New
r
en
r
e
base
:
mark --update-refs as requ
i
ring the
m
erge
b
ackend
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-15
Elijah
N
ewren
t6426: fix TODO about
m
aking t
e
st more comp
r
ehensive
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-13
Elijah Ne
w
ren
ls-files: guide f
o
lks to --exclude-standa
r
d
over o
t
her
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-13
El
i
jah
Newren
ls-files: c
l
arify
d
e
scripti
o
ns of sta
t
us tags
for -t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-13
Elijah Newren
ls-files:
clarify
d
escri
p
t
i
ons of file selection o
p
tions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-13
E
lijah Newren
l
s
-files
:
ad
d
mi
s
sing
d
o
cumentation for --resol
v
e-u
n
do
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-11-07
Elija
h
Newren
sparse
-
checkout
.
tx
t
: n
e
w doc
u
ment
with sparse-chec
k
o
u
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-10-23
Elijah Newre
n
merge-tree: su
p
port multiple
bat
c
hed merges with -
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-10-23
Elijah
N
ew
r
en
merge-tree: update docum
e
ntation
f
or
d
iffere
n
ces
i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-10-22
Elijah
Newren
merge-ort: fix
b
u
g wit
h
dir rename vs c
h
ange
d
ir to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-09-02
Elijah
Newre
n
d
i
ff: fix filtering of merge commits under --remerge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-09-02
Elijah Newren
diff: fix filtering of add
i
ti
o
nal
headers un
d
e
r
--r
e
m
e
r
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-09-02
Elija
h
Newre
n
d
i
f
f: h
a
ve submodule_format logic avoid
additio
n
al
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-26
Elij
a
h New
r
en
t64xx: c
o
n
vert 'test_create_repo' t
o
'g
i
t init'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
Elijah Newren
t4301: add m
o
re inte
r
esti
n
g merge-tr
e
e
testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
Elijah
N
ew
r
en
merge: small code readabilit
y
im
p
rovement
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
Elijah Newren
merge: c
l
ean
u
p con
f
u
s
ing logic fo
r
hand
l
ing
s
u
ccess
f
ul
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
Elija
h
N
e
wren
merge: onl
y
a
pp
l
y
autostash when appropr
i
ate
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-19
E
l
ijah Newren
revision: allow
--ancestry-p
a
th to
t
ake an
argument
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-19
Elijah
Newren
rev-list-o
p
tion
s
.
txt:
f
ix simpl
e
typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-19
Elijah
N
ew
r
en
mer
g
e-ort:
remove code obs
o
le
t
ed by other changes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
E
lijah New
r
e
n
merge-ort: provide helpful
s
ubm
o
d
u
le upda
t
e me
s
sa
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
Elij
a
h Newren
merge-ort: a
v
o
i
d surprise wi
t
h ne
w
sub_fla
g
variable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
Elijah Newren
merge-ort:
remove translator leg
o
in new "submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
m
e
rge: do not
ex
i
t restore_state() prematurely
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
mer
g
e: ensure we can actually rest
o
re pre-merge state
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
El
i
jah Newren
merge: make restore_state() resto
r
e staged
state too
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah
Newren
merge: fix sav
e
_state() to work when
t
h
ere
a
r
e
s
tat
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
E
lija
h
Newre
n
merge: do not abort
early if
o
ne
strate
g
y fails
t
o
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
merge: abort if index does not match HEA
D
f
o
r
t
r
i
v
i
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
E
l
ijah Newren
merg
e
-re
s
olve: a
b
ort
if inde
x
d
oes
n
ot match HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
El
i
j
a
h Newren
merge-ort-wrappers: make
p
r
i
nted mess
a
ge ma
t
c
h
t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah
Newren
merge-ort: fix issue with
dual
r
enam
e
and
add/a
d
d co
n
fli
c
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elija
h
Newren
me
r
ge-ort:
s
huff
l
e the computation and cleanu
p
of potenti
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Newren
merg
e
-ort: ma
k
e
a
separate
f
uncti
o
n
for freeing struct
.
.
.
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Newren
merge-ort:
s
mall clean
u
ps of check_for_directory
_
ren
a
me
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Newren
t6423: add
tests of
dua
l
director
y
rename plus
a
dd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-01
Elijah
Newren
t64
2
9:
fix u
s
e of non-existent f
u
nction
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah N
e
w
r
en
git
-
merge-tree
.
t
xt: add a section on pot
e
ntional
usage
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
Newr
e
n
mer
g
e-tree: add a --allow-unrelated-his
t
ories
f
lag
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newre
n
merge-tree
:
a
l
low `ls-files -u` style
i
nfo to be NU
L
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newre
n
merge-ort
:
optionally produce machine-rea
d
a
ble output
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Ne
w
ren
merge-ort:
s
tore more specific c
o
nfl
i
ct information
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elija
h
N
ewren
mer
g
e
-
tree
:
pr
o
vide ea
s
y ac
c
ess to `ls-files -u` style
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-tree: provide
a list of
which files have confl
i
cts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newr
e
n
merge-or
t
:
remov
e
comm
a
nd-line-cen
t
r
i
c submod
u
le message
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
N
ewren
merge-ort:
p
rovide
a merge_get_conflicted_files() helper
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
l
ijah Newr
e
n
m
erg
e
-
tre
e
:
s
upport including merge mes
s
ages in outpu
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
m
erge-
o
rt: split ou
t
a se
p
a
r
ate displa
y
_u
p
date_mess
a
g
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Ne
w
ren
m
e
rge-tree: imple
m
ent rea
l
merge
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
lij
a
h
Newren
m
e
rge-tree:
a
d
d
o
ption pars
i
ng
a
nd
initial shell for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah N
e
wren
me
r
g
e
-t
r
ee: move
l
ogic fo
r
exis
t
ing
me
r
ge into new
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
lijah Newren
merge-tree: rename merge_trees()
t
o trivial_merge_trees()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
E
lijah Newren
Documentation: some sparsit
y
wordin
g
cla
r
ifications
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elija
h
Newre
n
git-sp
a
rse-checkout
.
t
x
t: mark non-cone mode as depr
e
cated
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
g
i
t
-s
p
arse-checkout
.
txt: fle
s
h out pattern
se
t
sections
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Eli
j
ah
N
ewren
git-spar
s
e-c
h
eckout
.
t
x
t: add
a
new EXAMPLES section
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah
N
e
wren
git
-
spa
r
s
e
-checko
u
t
.
txt
:
s
huffle some s
e
ctions and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newre
n
g
i
t-spars
e
-chec
k
ou
t
.
txt: update docs for
d
eprecation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah
Newren
gi
t
-
s
parse-checkout
.
t
x
t: wording updates for the cone
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
E
l
ija
h
New
r
en
sparse-checkout: make
-
-co
n
e the default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
E
l
i
jah Ne
w
ren
tes
t
s:
s
top assuming --no-cone is t
h
e
d
efa
u
lt mode
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-03-02
El
i
jah
N
ew
r
en
repo_rea
d
_index: add conf
i
g
to expec
t
f
i
les ou
t
side
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-03-02
Elijah Ne
w
ren
m
e
rge-ort: exc
l
ude messages from inner
m
erges
b
y default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah New
r
en
m
e
r
g
e-ort
:
fix small mem
o
r
y
lea
k
in
unique_path()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
El
i
jah
Ne
w
ren
merg
e
-or
t
: fix s
m
all memory leak in
detect_and_proces
s
_renam
e
s()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
El
i
ja
h
Newren
sparse-
c
heckout: rejec
t
arguments in cone-m
o
d
e
th
a
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elij
a
h Newr
e
n
s
p
a
rse-checkou
t
: error
or warn when g
i
ve
n
individual
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah New
r
en
s
pars
e
-checkout:
pay
a
t
t
e
n
t
i
on to prefix
f
o
r
{set,
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah N
e
wren
s
p
arse-check
o
ut
:
c
o
rrectl
y
s
et
n
on-cone
m
o
de when expecte
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newren
s
parse-
c
h
eck
o
ut: correct
reapply's handling of opti
o
ns
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-17
Elij
a
h Newren
merge-ort: make info
r
mational
m
es
s
a
ge
s
from recurs
i
ve
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
diff-merges: av
o
id history simplificati
o
n
s
when dif
f
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
El
i
j
ah Newren
merge-o
r
t: mark conf
l
ict/warn
i
n
g messages from inner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elija
h
Ne
w
ren
show, log:
inclu
d
e conflict/warning messag
e
s in --remerge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
d
i
ff: add
a
bility to
insert additiona
l
head
e
rs for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah N
e
wren
me
r
ge-ort: forma
t
messages slightly diff
e
re
n
t
f
o
r use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
E
lijah New
r
en
m
er
g
e-ort: mark
a few more conflict messages as omittable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
E
lijah Newren
m
e
rge-ort:
capture
a
nd
p
rint ll-mer
g
e warnings in our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elija
h
Newren
ll-mer
g
e: make callers
r
espons
i
b
le for show
i
n
g warnings
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
log: c
l
ean unneeded objects during `
l
o
g --remerge-diff`
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Eli
j
ah Newren
show, log: provide a --remerge-diff cap
a
b
ility
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next