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
reftable: avoid undefined behaviour breaking t0032
2022-01-26
E
l
ij
a
h Newre
n
sequen
c
e
r, stas
h
: fix
r
unning fr
o
m wo
r
ktree subdir
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-04
Elijah Newren
stash: do not re
t
urn befo
r
e res
t
oring untracked files
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-30
Elijah Newren
m
erge-ort: fix b
u
g with reno
r
malizatio
n
and rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-23
E
l
ij
a
h
Newre
n
sp
a
r
s
e-checko
u
t
: remove
stray trailing space
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Ne
w
re
n
clone: avoid using
deprec
a
t
e
d
`sparse-che
c
kou
t
i
ni
t
`
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
E
lija
h
Newre
n
Documentation: clarify/co
r
rect a few sparsity
r
ela
t
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
git-spar
s
e
-
che
c
kout
.
txt: update
t
o document in
i
t/set
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Eli
j
ah
Newren
s
parse-chec
k
out: enable
r
eapply to
t
a
ke --[no-
]
{cone
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elija
h
Newren
sparse-checkout
:
enabl
e
`set` t
o
initialize s
p
arse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
E
l
ijah Newren
sp
a
r
s
e
-
check
o
u
t
: split out c
o
de
for t
w
eaking setti
n
gs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
El
i
jah Newren
s
p
arse-c
h
eckout:
d
is
a
llo
w
-
-no
-
s
t
din as an argu
m
ent
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newr
e
n
sp
a
rse-
c
heckout: add sanity
-
checks on i
n
itial sparsit
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
El
i
jah Newren
sparse-check
o
ut:
break
apart functions
f
or sparse
_
c
heckout_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
N
ewr
e
n
sparse-checkou
t
:
p
ass use_stdin as a par
a
meter inste
a
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
El
i
jah Newren
t2501: simplif
y
the tests since
we ca
n
n
o
w assume desire
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
Newren
dir:
new fl
a
g to remove_dir
_
recurse
(
) to sp
a
re the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
New
r
e
n
d
ir: avoid inc
i
de
n
ta
l
l
y
removing the original
_
cwd
i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
stash: do not
attempt to remove startup
_
info->origina
l
_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
l
ijah Newren
r
ebase: do not attempt
to remove
s
ta
r
tup_info->ori
g
i
nal_cw
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newr
e
n
c
lean: d
o
not attempt
to remove st
a
r
t
up
_
in
f
o->orig
i
nal_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newre
n
symlinks
:
d
o
not i
n
c
l
ude
s
tartup_info->ori
g
inal_cw
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
unpack-
t
rees:
add special cwd handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
l
ijah Newren
unpack-trees: refu
s
e to remove
startup_inf
o
->origi
n
al
_
cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
N
ewre
n
setup
:
introduce startup_info->origi
n
al_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
El
i
jah Newr
e
n
t2501:
a
dd various t
e
s
t
s
for r
e
moving the cur
r
ent wo
r
kin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-05
Elijah N
e
wre
n
sequencer
:
do not
e
x
p
o
rt GIT_DIR and GIT
_
W
O
RK_
T
REE
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-05
Eli
j
ah Newren
name-r
e
v
: prefer shorter names over following m
e
rges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-01
El
i
jah Newr
e
n
update do
c
u
m
en
t
ation for
n
e
w zdiff3 conflictStyle
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-11-30
Elijah Newren
sequencer: avoid adding exec command
s
f
o
r non-commi
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah N
e
w
r
en
Documentation: call out comm
a
nds
tha
t
nuke u
n
tracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newr
e
n
Comment
i
m
p
o
rtant
c
ode
p
aths r
e
ga
r
ding nu
k
ing
untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah
N
ewren
unpack-trees: avoi
d
nukin
g
untracked dir in way
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
u
npack-trees: avoid nu
k
i
ng untracked dir i
n
way of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newre
n
Change
unpack_t
r
ees'
'
rese
t
' flag
i
nto an
e
num
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah New
r
e
n
Re
m
ove ign
o
r
ed files by default when th
e
y are in the way
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
El
i
jah Newren
unpa
c
k-tr
e
es: mak
e
dir an i
n
t
er
n
al-on
l
y str
u
c
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
unpack-trees
:
introduce
pre
s
e
r
ve_ignore
d
to unpack_trees_
o
ptions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah N
e
wren
r
e
ad-tree, merge-r
e
cur
s
i
v
e: overw
r
ite i
g
n
ored
files
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
El
i
jah Newren
c
h
eckout, read-tre
e
: fix
l
eak of unpack_tree
s
_options
.
d
ir
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-24
Elijah Newren
t
2
5
00: add various te
s
ts f
o
r nuking untracked
f
iles
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-20
Elija
h
Newren
merge-o
r
t:
f
ix co
m
pletely wrong co
m
men
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-20
Elijah Newren
trace2
.
h: fix tri
v
i
a
l comment typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-12
Elijah Newre
n
tests:
r
e
move leftove
r
untracked fil
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah Newren
am: fi
x
incorre
c
t
exit status on
a
m fail to abort
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
El
i
jah
N
ewren
t41
5
1
:
add a
few a
m
--abor
t
t
e
st
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah New
r
en
git-am
.
txt: clarify --abort behavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah Newren
stash: res
t
ore
u
ntrac
k
e
d
files AFTER restor
i
n
g
t
racke
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah Newren
stash:
a
v
o
id feed
i
ng directories
t
o update-index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah Ne
w
r
e
n
t3903:
d
ocument a pai
r
o
f direct
o
ry/fil
e
bug
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
U
pda
t
e docs for change of defa
u
lt merge ba
c
kend
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newr
e
n
Change
d
e
faul
t
m
e
rge backe
n
d from recursive to
o
rt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
El
i
jah Newr
e
n
U
p
d
ate er
r
or message a
n
d
c
ode com
m
ent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elij
a
h Newren
merge-strategies
.
txt: add coverag
e
of
t
h
e `ort`
merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elij
a
h Newren
g
it-reb
a
se
.
txt:
c
orrect
out-of-d
a
te and mi
s
leading
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
me
r
ge-strategies
.
txt:
fix si
m
ple ca
p
italization e
r
ror
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
E
l
ij
a
h New
r
en
merge-
s
t
r
ategies
.
tx
t
: avoid giving special preference
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
mer
g
e-strategie
s
.
txt: do not
imply using copy dete
c
tion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elij
a
h N
e
wre
n
merge-strate
g
ies
.
txt: updat
e
wording for the resolve
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newr
e
n
Documentation:
edit awkward references to `git merg
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
E
lijah
Newren
d
i
rectory
-
r
e
name-detection
.
txt: small updat
e
s
due
to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
E
lijah
Newr
e
n
git-reb
a
se
.
txt: corre
c
t ant
i
quated cl
a
ims
about --reb
a
se
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-03
Elijah
N
e
w
ren
me
r
ge-
o
rt:
r
emove c
o
mpile-time ability to t
u
rn o
f
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newren
merg
e
-ort: reuse
p
a
th strings in pool_alloc_f
i
lespec
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah
N
e
w
ren
merge-ort
:
st
o
re filepai
r
s and filespecs in our
m
em_pool
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah
N
ewren
diffcore-rename, merge-ort: add wrapp
e
r
functions for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newr
e
n
merge-ort: switch o
u
r strmaps ov
e
r to using memor
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
E
l
ij
a
h Newre
n
merge-ort: set
up
a memor
y
pool
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Eli
j
ah N
e
wren
me
r
ge-ort: add pool_alloc, poo
l
_call
o
c, and pool_strnd
u
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
E
li
j
ah N
e
wren
diffcore-ren
a
me: use a mem_pool
f
or exact rena
m
e
d
etect
i
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
El
i
jah Newren
merge-ort: rename
str{map,intmap,
s
e
t
}_func(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
Elijah Newren
pull: fix h
a
n
dling of mult
i
p
le heads
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
Elijah
N
e
w
re
n
pull: update doc
s
&
code for
o
ption compatib
i
l
i
ty
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
Elijah Newren
pull
:
ab
o
rt by default wh
e
n fas
t
-f
o
rw
a
rding is not
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
Elijah Newre
n
pull:
make
--rebase
a
nd --no-
r
eba
s
e
o
verride pull
.
ff
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
Elijah Newren
pull: since --ff-only
o
verrides, handle
i
t
f
irst
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-21
Elij
a
h Newren
t7601: a
d
d t
e
sts of interac
t
ions with mult
i
ple
m
erge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-21
Elij
a
h N
e
wren
t
7
601:
test interaction
o
f
m
e
r
ge/rebas
e
/fast-
f
orward
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newren
merge-ort: restart merge with cached renames to re
d
uce
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elija
h
Ne
w
ren
merge-ort:
a
vo
i
d recursin
g
into directories w
h
en we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
El
i
jah Newren
merge-ort: defer recurs
i
n
g
i
nto dir
e
ct
o
ries when m
e
rge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah New
r
en
merge-ort: add a handle_d
e
ferred_en
t
ri
e
s
()
he
l
per function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elija
h
N
e
wren
merge-ort: add d
a
ta structures for allowabl
e
tri
v
i
al
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newren
m
e
rge
-
ort: add some more explanations
i
n c
o
lle
c
t
_me
r
ge_
i
nfo_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newren
m
erge-ort: reso
l
ve paths early when we h
a
ve suffic
i
ent
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
E
l
ijah Ne
w
ren
rename: b
u
mp lim
i
t def
a
ults yet
a
g
ain
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
El
i
jah N
e
wr
e
n
d
iffcore-r
e
n
a
m
e: treat
a rename_limit of 0 a
s
unlimited
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
Elijah New
r
en
doc: clarify documentation for rename/copy l
i
mits
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
E
l
ija
h
Newre
n
dif
f
: correc
t
wa
r
nin
g
message when rename
L
i
m
it exceeded
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-30
E
l
ijah
N
ew
r
en
m
e
rge-recursive: handle rename
-
to-sel
f
cas
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-30
Elijah
N
ewre
n
merge-
o
rt: ensure we consult df_conflict and path_confli
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-30
E
l
i
ja
h
New
r
en
t6
4
23: test d
i
rectory ren
a
mes cau
s
ing
r
ename-to-self
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
Eli
j
ah Ne
w
ren
mer
g
e-o
r
t
: add pref
e
tch
i
ng for c
o
n
tent m
e
rges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
Elijah Newre
n
diffc
o
re
-
r
e
name: u
s
e a
d
i
ffer
e
nt prefetch fo
r
basename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
Elijah Newren
diffc
o
r
e-rename: allow diffe
r
ent missing_ob
j
ect_
c
b
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
E
l
ijah Newr
e
n
t6421:
add tests check
i
ng for excessive object downloads
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-16
El
i
jah Newren
promisor-remote:
o
utput trace2 sta
t
is
t
i
c
s
fo
r
n
umber
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
Elijah N
e
wren
me
r
ge-ort: m
i
scellaneo
u
s touch-ups
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
Elijah N
e
wr
e
n
Fix various i
s
sues found in
c
omment
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
Elijah Newren
dif
f
core-
r
en
a
me: avoi
d
unne
c
essary strd
u
p'i
n
g i
n
break_idx
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
Eli
j
ah Newre
n
merge-ort
:
replace st
r
ing_list_df_nam
e
_com
p
a
r
e
w
ith
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next