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
merge: small code readability improvement
2022-08-24
Elijah Newren
merge: small
code reada
b
ility improvement
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
Elij
a
h Newren
merg
e
:
cleanup confusing
logic for
ha
n
dling
s
uccessfu
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
me
r
g
e
: do n
o
t exit
resto
r
e_
s
tate() prema
t
urely
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
E
l
ijah Newren
me
r
ge:
ensure we can actually re
s
to
r
e pre-merge st
a
te
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah
Newr
e
n
m
erg
e
: make r
e
store_state() restore sta
g
ed state too
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
E
l
ijah Newren
merge: fix
s
a
v
e
_st
a
te(
)
to work
w
h
e
n th
e
re are s
t
at
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
E
lijah Newren
me
r
ge: do not a
b
ort
e
arly if
o
ne
s
trategy fails t
o
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah
N
ewren
mer
g
e:
abor
t
if i
n
d
e
x does no
t
mat
c
h
HEAD for tri
v
i
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah New
r
e
n
m
e
r
ge-resol
v
e:
a
bort if index does n
o
t ma
t
ch H
E
AD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Ne
w
ren
merge-ort-wr
a
p
p
ers: make printed me
s
s
age matc
h
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
El
i
jah
Newren
merge
-
ort: fix issue
w
ith dual
r
ename and add/add conf
l
ic
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elija
h
N
e
wren
m
e
rge-ort: shuffle the
c
ompu
t
ation and
c
leanup of potential
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah
Ne
w
re
n
me
r
ge-ort: make
a separate functi
o
n for freei
n
g str
u
ct
.
.
.
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Newren
merge-ort: small c
l
eanups of check_
f
or_directory_rename
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-07-06
Elij
a
h
Newren
t6423: add
tests of
dual d
i
rectory rename plus ad
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-01
Eli
j
ah New
r
en
t6429: fix
us
e
of non-e
x
istent
f
unction
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
git-merg
e
-tree
.
t
x
t: add a section
o
n potent
i
onal usage
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
Newren
me
r
ge-tree: add a --allow-un
r
elated-histories
f
lag
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newre
n
me
r
ge-tre
e
:
a
l
low
`
ls-files -u` style
i
nfo to
b
e NUL
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
m
erge-
o
rt: op
t
ionally pr
o
d
uce machine-readable output
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
l
ijah Ne
w
ren
merge-ort: store more
spe
c
ific conf
l
ict
info
r
mation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
m
erge-tr
e
e: pro
v
ide
eas
y
access to `ls-files -u` style
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
Newr
e
n
mer
g
e-tree: p
r
ovide a list
of
w
hich files h
a
v
e conf
l
ict
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newre
n
m
erge-ort: remove
c
ommand-li
n
e-c
e
n
t
ri
c
subm
o
dule message
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
Newren
merge-ort: provide a merg
e
_ge
t
_co
n
flicted_
f
iles() help
e
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
lijah Newren
merge-tree: support including merge messages in out
p
ut
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newr
e
n
m
e
rge-
o
rt: split o
u
t
a separate
display_update_
m
essages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
m
erge-tr
e
e: implem
e
nt real merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
El
i
j
a
h Newren
merge-tre
e
: add option
p
arsing and
init
i
a
l
shel
l
fo
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
New
r
en
me
r
ge-tree: move logic fo
r
existin
g
merge
into new
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
mer
g
e-tree: rename me
r
g
e_trees() to
t
rivial_merge_
t
rees()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
E
l
ijah Newren
Documentation: some s
p
a
r
sity wording cla
r
ification
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
El
i
jah Newren
g
it-sparse-chec
k
ou
t
.
txt: mar
k
non-co
n
e mode
a
s
deprecat
e
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elija
h
Newren
git
-
spars
e
-checkou
t
.
t
xt
:
flesh out patte
r
n set sections
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
git-
s
parse-checkout
.
tx
t
:
add a new EXAMPLES secti
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah
Newre
n
git-s
p
arse-checko
u
t
.
txt:
shuffl
e
some sections and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
gi
t
-sparse-che
c
kout
.
txt: update docs for deprecation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Ne
w
r
e
n
git-
s
parse-checkout
.
txt
:
wor
d
ing
u
pdates for the cone
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
E
l
i
j
a
h
N
e
wren
spar
s
e-checko
u
t: make -
-
cone the defau
l
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Ne
w
ren
tests: st
o
p
a
s
suming --no-cone i
s
the default mode
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-03-02
El
i
jah Newren
repo_read_index: add c
o
nfig to expect
f
iles outs
i
de
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-03-02
Elijah Newren
merg
e
-ort: exclude messages
f
rom inner merges by
default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Ne
w
ren
merge-o
r
t: fix small memory
l
e
a
k
in unique_path()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newre
n
merg
e
-
o
rt: fix sm
a
ll
m
e
m
o
ry leak i
n
detect_a
n
d_p
r
oces
s
_r
e
names()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah
Newren
sparse-
c
heckout: rejec
t
argu
m
ents
i
n cone-mode that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
E
l
ijah Newren
spars
e
-check
o
u
t: error or war
n
when
give
n
i
ndividual
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newren
sparse-che
c
ko
u
t: pay atte
n
t
i
on to prefix
f
or {
s
et,
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah
N
ewren
sparse-
c
heckout:
c
orr
e
ctly set non-cone
m
od
e
when expec
t
e
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newren
sp
a
rse-checkout: correct r
e
apply's hand
l
i
ng of
op
t
io
n
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-17
Eli
j
ah Newren
merge
-
ort: make
i
nformational messages from re
c
u
rsive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
diff
-
merges:
avoid hist
o
ry simplifications
when diffing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah
Newren
merge-ort: mark confl
i
ct/warn
i
ng message
s
from i
n
ner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
show, log: include confli
c
t
/warnin
g
mess
a
ges in --reme
r
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah
Newre
n
di
f
f: add ability to i
n
s
er
t
additiona
l
headers for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah N
e
w
r
en
merge-ort
:
format messages sl
i
ghtly differe
n
t for u
s
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Eli
j
ah Newre
n
merg
e
-ort: mark a
f
e
w more con
f
lict messages a
s
omittable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Ne
w
ren
me
r
g
e-ort: cap
t
u
re and print ll
-
merge war
n
ings in our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
El
i
jah Newren
ll-mer
g
e: make callers r
e
sp
o
nsible f
o
r showing warni
n
gs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Eli
j
ah
Newren
log: clean unneed
e
d
objects during `log
-
-remerge
-
diff`
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elij
a
h
N
ewren
show, lo
g
: prov
i
de a
-
-
remer
g
e-
d
if
f
capability
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
repo-settin
g
s:
r
ename th
e
t
r
adit
i
onal default fe
t
c
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
El
i
jah Ne
w
re
n
r
ep
o
-se
t
tings: f
i
x
e
r
ror handling for un
k
nown
values
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elij
a
h
N
ewr
e
n
r
e
po-sett
i
ngs: fix che
c
king for f
e
t
c
h
.
n
egotiation
A
lgorithm
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-28
Eli
j
ah Newren
s
p
ar
s
e-checkout:
fix
a
c
ou
p
le minor
m
emory leaks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-26
Elijah N
e
wren
sequencer, stash: fix runnin
g
fro
m
work
t
ree s
u
bdir
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-21
Elijah Ne
w
re
n
merge
:
fix memory leaks in cmd
_
merge()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-21
E
lija
h
N
e
w
r
en
merge-ort: fix memory le
a
k
in merge_ort_internal()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-17
Elijah New
r
en
merge-
o
r
t: avoid assum
i
ng
all
r
enames
det
e
cted
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newren
A
c
celerate clear_skip_worktree
_
from_pr
e
sen
t
_
f
iles(
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newren
U
pdate d
o
cumentation related t
o
sparsity
a
nd t
h
e
skip
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Ne
w
ren
repo_read_i
n
dex: clea
r
S
K
I
P_WORKT
R
EE bi
t
from fil
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Ne
w
ren
unpack
-
trees: fix
accidental loss of
u
s
e
r
changes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elijah N
e
w
r
en
t1011: a
d
d
testcase de
m
onstrating accidental loss
o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-04
E
l
ijah Newren
stash: do no
t
return
b
efo
r
e rest
o
ring untr
a
cked
files
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-30
E
lijah Newr
e
n
merge-ort:
f
i
x bug with
r
enor
m
alization an
d
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-23
El
i
jah
Newren
s
p
a
rse-checkout: remove stray trailing space
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
N
ewren
cl
o
ne: avoid using deprecated `sparse-chec
k
out init`
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
D
ocumentati
o
n: clarify/correct a f
e
w sp
a
rsity r
e
lated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elija
h
Newren
git-spar
s
e-checkou
t
.
txt
:
update
t
o do
c
ument init/set
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elija
h
New
r
e
n
sparse-c
h
eckout:
enable r
e
apply to take
-
-[no-]{co
n
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
E
l
ijah Newren
s
parse-checkout:
e
nable `se
t
` to init
i
alize sparse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
sparse-checkout: split out code for tweaking settings
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
spar
s
e
-
che
c
kout: disallow
--no-stdin as
an argument
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
s
parse-check
o
ut: add sanity-checks on init
i
al spars
i
ty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
El
i
jah Newre
n
spar
s
e-
c
he
c
kout
:
b
reak apart functions for sparse_checkout_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
sparse
-
ch
e
ckout: pass use_stdin
a
s a parame
t
er
i
n
stead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
N
ewren
t2501: simpl
i
fy
t
he test
s
s
i
nc
e
w
e c
a
n now assume desire
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah N
e
wre
n
di
r
: new flag to remove_di
r
_recurse
(
)
to
s
pare
t
he
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Eli
j
ah Newren
dir: a
v
oid i
n
cidentally
r
emo
v
ing the original_cwd i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elija
h
Newr
e
n
stash: do not attempt to
r
emove
s
t
a
rtup_in
f
o->o
r
iginal_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
N
ewren
rebase: do not attemp
t
t
o
remove star
t
up_info->
o
rig
i
nal
_
cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elija
h
New
r
en
clean: do not at
t
empt to r
e
m
o
v
e
startup_i
n
fo->original_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
lijah Newren
sym
l
inks: do not include startup_
i
nfo->
o
r
ig
i
nal_c
w
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
lijah Newr
e
n
un
p
ack-trees: ad
d
special
c
wd
ha
n
dlin
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
l
ijah Ne
w
r
e
n
unpack
-
trees:
refuse to
r
emove startup_info->original_c
w
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Eli
j
ah Newren
setup
:
introd
u
ce sta
r
tup_in
f
o->orig
i
nal_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah N
e
wr
e
n
t2501:
a
dd
vario
u
s tests for removing the
c
ur
r
ent wor
k
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-05
Elij
a
h Newren
sequencer: do not
export
G
I
T_
D
I
R and GIT_WORK_
T
REE
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-05
El
i
j
ah N
e
wr
e
n
name-rev: pre
f
er shor
t
er names over following merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-01
El
i
jah New
r
en
update documenta
t
io
n
f
o
r
n
ew zdiff3 conflictStyle
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next