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
Git 2.35.3
2022-01-26
E
lijah Ne
w
ren
sequencer, stash: fix running fro
m
wo
r
k
tree subdir
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-04
Elijah Newren
stash:
do not retur
n
befor
e
restoring untracked
f
i
les
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-30
E
lijah Newren
m
er
g
e-ort: fix bug
with renorm
a
lizat
i
on a
n
d rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-23
Elijah Newren
sparse-checkout: remove
s
tray
trailing
space
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
El
i
jah Newren
clone:
a
void using deprecated `s
p
arse-chec
k
out init`
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
N
ewren
Docume
n
tation: clarify/correct a
f
ew sparsity
r
e
lated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
E
l
i
jah Newren
git-sparse
-
c
h
ecko
u
t
.
txt: update to docume
n
t i
n
it/set
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Ne
w
r
en
spars
e
-checko
u
t: enable reapply to take
-
-
[
no-]
{
cone
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Ne
w
ren
sparse-checkout: enable `se
t
` to i
n
itial
i
ze spar
s
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elij
a
h Newren
s
parse-checkout: split ou
t
code
f
or
tweak
i
ng
s
e
t
tings
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
Ne
w
ren
sparse-checkout: disal
l
ow --no-
s
tdin a
s
an argume
n
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elij
a
h Ne
w
r
en
s
p
ar
s
e
-check
o
ut: add s
a
nity-ch
e
ck
s
o
n
initial sparsity
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newr
e
n
s
p
a
rse-che
c
kout: break apart
func
t
ions fo
r
sparse_checkout_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
N
ewren
sparse-checkout: pass use
_
std
i
n
as a
p
aramet
e
r
instead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elija
h
Ne
w
ren
t
250
1
: sim
p
lify th
e
te
s
t
s since we can n
o
w as
s
ume
d
esired
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
dir: new flag to remo
v
e_dir_re
c
urse()
to spare the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
El
i
jah N
e
wren
dir: avoid inci
d
entally removing the o
r
i
ginal_cw
d
i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elij
a
h Newren
stash: do not attempt to remove sta
r
tup_info->ori
g
inal_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
N
ewren
re
b
a
s
e: do not attempt to
r
e
move st
a
r
t
u
p
_i
n
fo-
>
original_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
l
i
jah Newren
c
lean: do
not a
t
tempt to remove startu
p
_in
f
o
-
>orig
i
nal_cw
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
El
i
jah Newren
symlinks:
do no
t
i
n
c
lude startup_info->original_cwd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
unpack-trees: add special cw
d
h
an
d
l
i
ng
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elija
h
Newren
unpa
c
k-trees: re
f
us
e
to rem
o
ve startup_in
f
o->o
r
igina
l
_
cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elij
a
h New
r
en
s
etup: in
t
roduce startu
p
_info->original_
c
w
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Eli
j
ah Newren
t2501: a
d
d vari
o
us tests for removing
the cur
r
ent w
o
rking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-05
Elijah New
r
en
sequencer
:
do
not export GIT_
D
IR and GIT_WORK_TREE
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-05
El
i
jah Newren
na
m
e-rev: prefer
shorter na
m
e
s
over follow
i
ng
m
e
r
ges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-01
El
i
ja
h
Newren
update
d
ocumentation
f
o
r new
z
diff3 conflict
S
tyle
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-11-30
Elijah Newren
se
q
uencer: avoid addin
g
ex
e
c c
o
m
m
a
nds f
o
r no
n
-commit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elij
a
h
N
ewren
Documentation:
c
a
l
l out commands th
a
t
nuke untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Eli
j
ah Newren
Comme
n
t importan
t
codepaths regarding nuking untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah New
r
en
unpack
-
trees: avoid nuking untracked dir in
w
ay of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
u
npack-trees: avoid nuk
i
ng unt
r
ack
e
d dir in
way o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah N
e
wren
Change u
n
pack_
t
rees' 'res
e
t' f
l
ag into a
n
enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
R
emove ignored fi
l
es by default
w
h
en
t
h
ey ar
e
in
the w
a
y
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
El
i
ja
h
Newr
e
n
unpack-tr
e
e
s: ma
k
e dir an inter
n
a
l
-only s
t
ruc
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elij
a
h Newren
unpack-t
r
ee
s
: introduce prese
r
ve_ignored to
u
n
p
ack_trees_
o
ptions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
r
ead-tree
,
m
erge-recursive: ov
e
rwrite ignored files
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Eli
j
ah N
e
wren
checkout,
r
ead-tre
e
: fix leak of
u
npack_tree
s
_
o
p
t
ions
.
dir
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-24
Elijah Newren
t2500: add various tests for n
u
king untrac
k
ed files
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-20
El
i
ja
h
N
ewr
e
n
merge-ort: fix
c
ompletely wr
o
ng commen
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-20
El
i
jah Newr
e
n
t
race2
.
h
:
fix trivial comment typ
o
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-12
E
lijah New
r
en
tests: remove
leftover untracked file
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah Ne
w
ren
a
m
: fix incorrect
exit
s
tatus on am fa
i
l
t
o abo
r
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah Newre
n
t4151: add a
f
ew
am --abort tests
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Eli
j
a
h
Newren
git-am
.
txt
:
clarify --ab
o
rt behavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah Newren
stash: resto
r
e
untracked files AFTER restoring tracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah
Newren
stash
:
avoid f
e
e
ding
d
irectories to update-index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah
N
ewre
n
t
3
903
:
document a pair of directory/file
b
ugs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
Update d
o
cs for chan
g
e of d
e
fault merge backend
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
Cha
n
g
e
def
a
ult me
r
ge backend from recurs
i
ve to
ort
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
Upd
a
t
e
e
rro
r
me
s
sage and code comm
e
nt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Eli
j
ah Newren
merge-strategie
s
.
txt:
a
dd covera
g
e of
t
he `
o
rt` mer
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
El
i
j
ah N
e
wren
git-r
e
b
a
s
e
.
txt: correct ou
t
-of-date and misleading
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
E
lijah
Newren
merge-strategies
.
txt:
f
ix s
i
mple
c
a
p
italization
error
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah New
r
e
n
merge-strategies
.
txt: avoid giv
i
n
g
spec
i
a
l
pref
e
rence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newre
n
m
erge-strategies
.
txt: do no
t
imply using copy detec
t
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah
N
ewren
merge-str
a
te
g
ies
.
t
xt
:
upda
t
e wordin
g
for
the re
s
ol
v
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah New
r
en
Documentation: edit
a
wkward
references to `g
i
t
m
erge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
El
i
jah New
r
en
directory-renam
e
-detecti
o
n
.
tx
t
: small updat
e
s due to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Eli
j
ah Newren
git-reba
s
e
.
txt: correct antiquated
c
la
i
ms about --rebase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-03
Elijah
N
ewren
merge-ort: r
e
move compile-ti
m
e
ability t
o
tu
r
n
o
f
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah New
r
en
merge-ort:
r
euse path strings in
pool_alloc_file
s
pec
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
E
l
ijah Ne
w
ren
merge-ort: store filepairs and filespecs in
our mem
_
p
o
o
l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah
N
ew
r
e
n
diffcor
e
-
rename, merge-ort: add wrappe
r
f
u
nctions for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elija
h
N
e
w
ren
merge-ort: switc
h
o
u
r s
t
rma
p
s ov
e
r to us
i
n
g memory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Eli
j
a
h N
e
wr
e
n
m
e
rge-or
t
:
set up a me
m
ory pool
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah
N
ewren
merge-ort: add pool_alloc,
p
ool_callo
c
, and
pool_st
r
ndup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newr
e
n
diffcor
e
-rename: use a m
e
m_pool for exact rename
detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
E
lijah Newren
merge-ort
:
rename str{map,intmap,set}_func(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
E
l
ija
h
Newren
pull: fix handling o
f
mul
t
iple he
a
d
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
Elijah Newren
pull
:
update docs
&
code f
o
r
o
p
t
io
n
compatibili
t
y with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
Elijah
Newre
n
pull
:
abort by default when fast-forwarding
is
not
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
Eli
j
ah
Newren
pull: make --rebase
a
n
d
--no-rebase
o
verride pull
.
ff
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
E
l
ijah Newren
pull: since --ff
-
only overrides, ha
n
d
l
e it
firs
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-21
E
l
ijah
N
ewren
t7601: ad
d
tests of
i
nteractions with multiple
m
e
r
ge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-21
El
i
jah Ne
w
re
n
t7601: tes
t
interaction of merge/rebase/fast-for
w
ard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Eli
j
ah
Ne
w
ren
merge-ort:
r
estart merge with cache
d
renam
e
s to reduce
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newren
m
e
rge-ort:
a
void
r
ecursing into directories when we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
E
lijah Newren
m
erg
e
-or
t
: defer recu
r
s
i
ng into directories
w
h
en merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elija
h
Ne
w
r
en
m
e
rge-ort: a
d
d a ha
n
dle_defe
r
red_entries() he
l
per
f
u
nct
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newren
merge-ort:
a
dd data structures for allowable trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
E
l
ij
a
h
Newren
merg
e
-ort: add some more explana
t
ions in collect_merg
e
_
info_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newren
mer
g
e-ort: reso
l
v
e
pa
t
h
s
earl
y
when we have
sufficient
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
Elijah Newren
re
n
am
e
:
bump li
m
i
t defaul
t
s yet again
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
Elijah Newren
diffcore-rename: treat a ren
a
me_l
i
m
it of
0 as unl
i
mi
t
ed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
E
lijah Newren
do
c
:
clarify do
c
umen
t
atio
n
for rename/cop
y
limits
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
Elija
h
Newre
n
diff:
c
orrect
w
a
rn
i
ng message whe
n
re
n
ameLimit exceeded
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-30
Elijah Newren
mer
g
e-recursive: handle rename
-
to-self case
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-30
Elijah
N
e
wren
m
erge-ort: ensure
we c
o
nsult df_confl
i
c
t
and path_conflic
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-30
Eli
j
a
h
Ne
w
ren
t
642
3
: test directo
r
y r
e
names causing
rena
m
e-to-self
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
Elij
a
h
N
e
w
ren
merge-ort: add prefetching for cont
e
nt me
r
g
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
Elijah N
e
wren
diffcore-rena
m
e:
use a different pre
f
etch f
o
r ba
s
ename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
Elijah Newre
n
diffcore-rena
m
e
: allow dif
f
erent
missing_object_cb
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
Elija
h
Newr
e
n
t6421: add tests
c
hecking for excessive o
b
ject downloads
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-16
Elij
a
h Newren
pr
o
misor-re
m
o
t
e: output trace2 statistics
f
or
n
umber
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
Eli
j
a
h
N
ewren
merge-o
r
t: miscellaneous to
u
ch-u
p
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
E
lijah Newren
Fi
x
various issues found in comm
e
nts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
Elij
a
h Newren
diffcore-rename: avoid unn
e
cessary strdup'
i
n
g
in break
_
idx
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
El
i
j
a
h Newr
e
n
merge-ort: replace s
t
r
i
ng_list_
d
f_name_co
m
pare
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next