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
t4301: fix broken &&-chains and add missing loop termination
2022-08-24
E
l
ijah Newren
t4
3
01: add more i
n
teresting merge-tree testca
s
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
Elijah Newren
merge-ort: provide he
l
pful submod
u
le u
p
date message
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
Elij
a
h Ne
w
r
en
me
r
ge-ort: av
o
id
s
urprise with new sub_fl
a
g
va
r
iable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
Eli
j
a
h
N
ew
r
en
merge-ort: remove t
r
a
nslat
o
r lego
i
n
new "submodu
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
E
l
ijah Newren
merge: do not exit restore_state()
pre
m
at
u
rely
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah
N
ewren
merge:
e
nsure we ca
n
a
c
tually
r
e
store pr
e
-merge state
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
E
l
i
j
ah Newren
me
r
g
e
: make restore_state()
r
estore stag
e
d s
t
ate
t
oo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newre
n
merg
e
: fix sa
v
e_state() to work whe
n
there are s
t
at
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah
Newren
merg
e
:
d
o
n
o
t
a
bort earl
y
i
f one strat
e
gy
fails to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Eli
j
ah Newren
merge: abort if i
n
dex does not match HEAD for trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
E
lijah N
e
w
r
en
m
erge-resolve:
a
bort i
f
index
does n
o
t
m
a
tch HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
merge-ort-wrappers: ma
k
e printed message ma
t
c
h the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Newren
merge-ort: fix iss
u
e with dual ren
a
me and add/
a
dd conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Newre
n
merge-ort: s
h
uffle the
c
om
p
utation and cleanup of po
t
e
ntial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah N
e
wren
merge-ort:
make a
s
epa
r
ate funct
i
on
for freeing struct
.
.
.
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-07-06
Elija
h
Newre
n
merge-ort: sm
a
ll cleanups of check
_
for_di
r
e
c
tory
_
r
ename
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Newr
e
n
t6423
:
add t
e
sts
o
f d
u
al d
i
r
ect
o
ry rename plus add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-01
Elijah Newren
t6429: fix use o
f
non-existe
n
t fun
c
tion
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-06-22
Elija
h
Newren
git-merge-tree
.
txt: add a section on
p
ote
n
tional usage
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elija
h
Newren
merge
-
tree: add a -
-
allow-unrelat
e
d-hi
s
tories flag
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah N
e
wren
merge-tr
e
e: allow `ls-file
s
-u` st
y
le i
n
f
o
to be
N
UL
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
l
i
jah Newren
merge-ort: opt
i
onally produ
c
e
m
a
chine-rea
d
a
ble
o
utput
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah N
e
wren
m
erge-ort: store more specific con
f
lict in
f
orma
t
ion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
N
ewr
e
n
m
erge-tree:
p
rovide
easy access t
o
`l
s
-file
s
-
u` style
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elija
h
N
e
wren
m
erg
e
-tree: provide a
l
ist of wh
i
ch
file
s
have con
f
li
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elij
a
h
Newren
mer
g
e-ort: remove com
m
and-line-cen
t
r
i
c submo
d
ule message
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
El
i
jah Newren
m
erge-ort: provide a merge_get_
c
onflicted_files() help
e
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
Ne
w
ren
merge-tree:
support including
merge messages
i
n ou
t
put
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
l
ij
a
h
Newren
m
e
rge-ort:
split
o
ut a separat
e
display_upd
a
t
e
_message
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newre
n
merge-tree: im
p
lement real merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
m
erge-tre
e
: add
o
p
t
i
on parsi
n
g
and initia
l
shell for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
El
i
jah Newren
merge-tree: move log
i
c for existing merge into new
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
Newre
n
mer
g
e
-tree: re
n
ame me
r
ge_tree
s
(
)
to t
r
ivial_me
r
ge_trees()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elija
h
Newre
n
Document
a
tion: some sparsi
t
y w
o
rding clarific
a
tions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
git-sparse-checkout
.
txt: ma
r
k non-cone mode as deprecated
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
gi
t
-sparse-chec
k
out
.
t
x
t: flesh
o
u
t patt
e
rn s
e
t sections
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
git-spa
r
se-che
c
kout
.
tx
t
: add a
new EXAMPL
E
S
s
ecti
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
git-
s
parse-checko
u
t
.
t
x
t: s
h
uffle some
sections
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah
N
ewren
git-spar
s
e-checkout
.
txt: update docs
f
or deprecation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Ne
w
ren
git-sparse-checkout
.
txt:
w
o
rding updates for th
e
cone
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah N
e
wren
sparse-check
o
u
t
: make --con
e
the
d
efault
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah N
e
wren
tests: sto
p
a
ssuming --no-cone is the def
a
ult mode
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-03-02
Elijah N
e
wren
repo_r
e
ad_index: add c
o
nfig to expect files outside
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-03-02
Elijah Newren
me
r
ge-
o
rt: exclude
m
e
ssages from inne
r
me
r
ges by default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
E
l
i
j
a
h Newre
n
merge-ort: fi
x
s
m
a
ll memory leak in uni
q
ue_path()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newren
me
r
ge
-
or
t
: fix
small memory leak
i
n detect_and_process_re
n
ames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
E
l
ijah Newren
sparse-checkout: reject arg
u
ments in cone-m
o
de
that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newre
n
sparse-chec
k
out: e
r
ror
o
r
w
arn whe
n
given indiv
i
dual
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newre
n
sparse
-
c
heckout: pay attention to p
r
efix fo
r
{set,
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah
Newren
s
p
arse-checkout: correctly
set n
o
n
-
cone mode
w
hen expected
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah N
e
wren
s
parse-checko
u
t
: correc
t
reapply's han
d
ling of
options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-17
E
lij
a
h Newren
merge-ort: make informational messages from recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
El
i
jah Newren
d
i
ff-
m
erges: avoid
his
t
or
y
simplificati
o
ns when diffing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
E
lijah
Newren
m
erge-o
r
t: mark conflict/warning
m
e
s
s
a
g
es f
r
om inner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Ne
w
ren
s
h
o
w
,
l
og: inc
l
ude confli
c
t/warning mes
s
ages in --remerge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah
N
ewren
d
if
f
: add a
b
ilit
y
to i
n
sert ad
d
itional h
e
a
ders for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newre
n
m
e
rge-ort: format messages slightly dif
f
e
r
ent for use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
merge-ort: mark a few more
c
o
nfl
i
c
t
m
essages
a
s
o
mittable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
E
l
ijah Newr
e
n
merge-ort
:
c
a
pture
and print ll-me
r
ge wa
r
ni
n
gs in
o
ur
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
l
l-mer
g
e: make
callers r
e
sponsible f
o
r sho
w
ing warn
i
ngs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah
Ne
w
ren
log: cle
a
n unnee
d
ed ob
j
ects
d
uring
`
l
o
g --remerge-diff`
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah N
e
wren
show, log: pr
o
vide a -
-
remerge-diff capab
i
lity
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
E
lija
h
Newren
repo-settings: rename the traditi
o
nal default
fetch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elija
h
N
ewren
repo-settings: fix er
r
or h
a
ndli
n
g fo
r
unkno
w
n
v
alues
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Eli
j
ah Newre
n
repo-settings
:
fix ch
e
cking for f
e
tch
.
negotiationAlgorithm
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-28
Elij
a
h
Newren
sp
a
rse-checkout: fix
a
co
u
ple mi
n
or memory leaks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-26
Elijah Newren
sequencer, stash: fix running fr
o
m worktre
e
subdir
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-21
Elijah Newren
merge: fix memory leaks in cmd_me
r
ge()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-21
Elij
a
h Newr
e
n
merge-ort: fix memory leak i
n
me
r
ge_or
t
_i
n
ternal()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-17
Eli
j
a
h Newren
merge-ort:
avoi
d
assuming all rena
m
es detected
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
E
lijah Newren
Accelerate cl
e
ar_skip_worktree_fr
o
m_pres
e
n
t_f
i
le
s
(
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
E
l
ijah Newren
Update documentation related
to sparsity a
n
d the skip
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newren
r
e
po_read_in
d
ex: clear
S
KI
P
_WORKT
R
EE bi
t
from f
i
le
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newren
unpac
k
-tre
e
s:
fix
accidental lo
s
s
o
f
u
ser cha
n
ges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
El
i
jah Ne
w
r
en
t1
0
11: add testcas
e
d
e
m
o
n
strating acc
i
dental loss of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-04
E
li
j
ah Newren
stash:
d
o
n
ot
r
e
turn before
restoring untracke
d
files
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-30
El
i
j
a
h Newren
merge
-
o
r
t: fix bug wit
h
renormalizat
i
on
and rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-23
Elijah Newren
spar
s
e-checkout: rem
o
ve stra
y
trai
l
ing space
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
E
lijah N
e
wren
clo
n
e: avoi
d
using deprecate
d
`spa
r
se-checkout
i
nit`
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
E
l
ijah
Newren
Documentation: cla
r
ify/correct a few sparsity related
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
git-spa
r
se-c
h
e
c
kou
t
.
txt:
u
p
date to
d
ocument init/set
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
spars
e
-
c
he
c
kou
t
: enable re
a
pply to ta
k
e
-
-[no-]{cone
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newr
e
n
spar
s
e-check
o
u
t:
e
nable `
s
et
`
to initialize sparse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elija
h
Newren
sparse-c
h
eckout: split out code for t
w
eaking setti
n
gs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
s
parse-checkout: disal
l
ow --no-stdin as
an
a
r
gument
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
El
i
jah Newren
spars
e
-
c
heck
o
ut: add sanity-checks on
i
nitial sp
a
rsity
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Ne
w
r
e
n
spa
r
se-checkout: break
a
part func
t
ions for sparse_checkout_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
E
l
i
jah N
e
wren
s
parse-checkou
t
: pass use_stdi
n
as a parameter instead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Eli
j
ah
N
ewren
t
250
1
:
s
im
p
lify the tests since we c
a
n now
a
ssum
e
desired
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
dir: new flag to remove_dir_
r
ecur
s
e(
)
to
spare the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newre
n
dir: avo
i
d incident
a
lly removing the original_cwd in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
lijah Newre
n
stash: do not attempt to remove sta
r
t
u
p_info
-
>or
i
ginal_
c
wd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
l
ija
h
N
ewren
rebase: do n
o
t attempt to remove star
t
u
p
_i
n
fo->original_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
lij
a
h Newren
clean: do not
attempt to remove startup_
i
nfo->original_c
w
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah N
e
wren
s
ymlinks: do no
t
i
n
c
lude startup
_
i
n
f
o
->origi
n
al_cwd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
lijah Newren
u
n
p
ac
k
-trees
:
add special c
w
d
handli
n
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Ne
w
r
e
n
unpac
k
-trees: refuse to
r
emov
e
st
a
rtup_info->original_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
lijah Newren
setup: in
t
roduce
startup_info->
o
r
igi
n
al_c
w
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
l
ijah
N
ewren
t
2
501: ad
d
v
ar
i
ous tests fo
r
removing the
c
u
r
r
ent workin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-05
Eli
j
ah Newren
sequen
c
er: do
n
ot exp
o
rt
G
IT_DIR and GI
T
_WORK
_
T
R
EE
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next