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
Accelerate clear_skip_worktree_from_present_files() by caching
2022-01-14
E
l
i
jah Ne
w
ren
Accelerate clear_skip_w
o
rkt
r
e
e
_
f
rom_presen
t
_files(
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newren
U
p
date documentati
o
n
r
e
l
ated to sparsity and
the skip
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
Eli
j
ah New
r
en
repo_r
e
ad_index: cle
a
r
S
KIP_
W
O
RKTREE bit fr
o
m files
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newren
unpack-trees
:
fix accidental los
s
o
f
u
s
er changes
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newren
t1011: add testcase demonstrating accid
e
ntal loss of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-04
Elijah New
r
en
s
t
as
h
: do n
o
t re
t
urn befor
e
restoring
u
nt
r
acked files
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-30
Elijah Newren
m
e
rge-ort: fix
b
ug
with renormalizat
i
on
and
r
e
name
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-23
El
i
jah Newr
e
n
sparse-checkout: remove stray t
r
ailing space
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elija
h
Ne
w
ren
clone: avoid us
i
ng d
e
prec
a
ted `sparse-checkout init`
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
E
l
ijah Newren
Doc
u
mentation: clarify/correct a
f
e
w
sp
a
rsity related
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
g
i
t-sparse-checkout
.
txt: update to do
c
ument
i
nit/set
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
E
l
ijah New
r
en
sparse-checkout: enable rea
p
p
l
y to t
a
ke --[no-]{cone
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
E
l
ija
h
Newren
sparse-checkout: en
a
ble `se
t
` to init
i
alize spars
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
s
p
a
rse-checkout: split out
code
for tweaking settings
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
sparse-checkout:
dis
a
llow --no-stdin as an argument
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elij
a
h
Ne
w
ren
sparse-check
o
ut: a
d
d
s
anity-checks on
i
nitial sparsity
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
sparse-checkout:
b
r
e
a
k
a
part
f
unctions f
o
r sparse_checkout_
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
E
lijah N
e
wren
sparse-checkout: pass
u
se_st
d
in as a paramet
e
r
i
nstead
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
N
e
wren
t2501: simp
l
ify the
t
ests si
n
ce we can now assume desired
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
Ne
w
ren
dir
:
new
f
l
a
g to remove_dir_
r
ecurse() t
o
spare the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
N
ewren
dir: avoid
i
ncidentall
y
removing the
o
riginal_cwd in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
E
lija
h
New
r
en
stash: do not at
t
em
p
t
to
remove s
t
ar
t
up_info->original_cw
d
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
r
e
b
a
s
e:
d
o n
o
t atte
m
pt t
o
re
m
ove startup_in
f
o
-
>original_cwd
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newre
n
clean: do not
attempt to
r
emove
start
u
p_info->original_cwd
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah New
r
e
n
symlinks: do not inc
l
ude
sta
r
tu
p
_info
-
>original_cwd
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elij
a
h Newren
unp
a
c
k
-trees: add special
c
wd handling
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Eli
j
ah Newre
n
u
npac
k
-trees: refuse to
r
emove s
t
a
r
tup
_
inf
o
-
>
o
riginal_
c
wd
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
s
e
tup: introduce startup_info->original_cwd
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
El
i
jah Newren
t2501: add
vari
o
u
s te
s
ts for
re
m
oving
the current worki
n
g
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-05
Elijah New
r
en
sequenc
e
r: do
n
ot
e
xport
GI
T
_D
I
R and GI
T
_W
O
RK_TREE
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-05
Eli
j
a
h Newren
name-rev: prefer
sh
o
rter names over
f
oll
o
wing merges
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-01
E
lija
h
Newren
update documentation for new z
d
iff3 conflictStyle
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-11-30
Elijah Newren
sequencer:
avoid a
d
ding
e
xec com
m
ands for non-co
m
m
i
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
Document
a
tion: call o
u
t commands th
a
t
n
u
ke untracked
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah
N
e
w
r
en
Comment
i
m
portant codepaths r
e
gardin
g
nuki
n
g untracked
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
E
lijah Newren
unpack
-
trees: avoid n
u
king untracked dir
i
n way of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Ne
w
ren
unpack-trees: avoid nuki
n
g untracked dir in way
o
f
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elija
h
N
e
w
ren
Change unpack_trees' 'reset
'
flag into an enum
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
Remo
v
e
ignored files by default when they ar
e
in the
w
a
y
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
E
l
ij
a
h Newren
unp
a
ck-tree
s
: m
a
ke dir an int
e
rnal-only
s
t
ruct
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
E
lijah
N
e
wren
un
p
ack-trees:
i
ntroduce preserve
_
i
gnored to u
n
pack_
t
r
e
es_op
t
ions
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newre
n
read
-
t
r
ee, merge-recursive: overwrite ign
o
r
e
d files
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
E
l
ijah Ne
w
ren
checko
u
t, read-tr
e
e: fi
x
leak of unpac
k
_tree
s
_options
.
dir
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-24
E
lijah Newren
t25
0
0: a
d
d
v
arious tests for nuking untr
a
cked files
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-20
Elijah New
r
en
merge-ort: fix completely wron
g
co
m
m
en
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-20
Elij
a
h N
e
wren
tr
a
ce2
.
h:
fix t
r
ivi
a
l
com
m
ent
t
ypo
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-12
Elija
h
Newren
te
s
ts
:
r
emove left
o
ver untracked
fi
l
es
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-10
Elija
h
N
e
wren
a
m
: fix incorre
c
t exit s
t
at
u
s
on am fail to abort
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-10
E
l
ijah Ne
w
ren
t4151: add a few am --abort tests
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-10
El
i
jah Newren
git-am
.
t
xt: clarif
y
--abort
behavi
o
r
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-10
E
l
ijah N
e
wren
stash: restore untracked files AFTER re
s
to
r
ing tr
a
cked
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-10
Eli
j
ah Newren
stash: avoid feedin
g
directories
to update-inde
x
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-10
Elija
h
New
r
en
t3903: document
a pair of directory/file
b
ugs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newre
n
Upd
a
te docs for
c
ha
n
ge o
f
default m
e
rge backend
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
Change def
a
ult merge backend from
recursive to
o
rt
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
El
i
jah Newre
n
Update error
m
essage and code comment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elijah N
e
wre
n
merge-strategies
.
txt: add coverag
e
of the `o
r
t` mer
g
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
E
lijah Ne
w
r
en
gi
t
-reb
a
s
e
.
txt:
cor
r
ect out
-
of-date and misle
a
di
n
g
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elij
a
h Newren
merge-s
t
rategies
.
txt: fi
x
simple ca
p
italiza
t
io
n
e
r
ror
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
E
lijah Newre
n
merge
-
str
a
teg
i
es
.
t
x
t: avoid giving special pr
e
ference
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
Eli
j
ah N
e
wren
merg
e
-
s
t
r
ategie
s
.
t
x
t: do no
t
i
m
p
ly using copy
d
ete
c
tion
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
E
lijah Newren
m
erge-st
r
ate
g
ies
.
txt: update wording for the resolve
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newr
e
n
Docume
n
tation:
e
dit awkward refe
r
ences to `git m
e
rge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
d
ir
e
ctory-ren
a
me-detection
.
t
x
t:
s
m
a
ll updates
d
ue to
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elijah New
r
en
g
it-reb
a
se
.
tx
t
: correct antiq
u
a
t
e
d claims about --r
e
base
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-03
Elija
h
Newren
m
e
rge-
o
rt: rem
o
v
e
compi
l
e-ti
m
e abil
i
t
y
t
o turn
of
f
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Ne
w
r
e
n
merge-ort: reuse path strings in pool_alloc
_
fil
e
spe
c
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
Elijah
N
ewren
mer
g
e-o
r
t
:
sto
r
e filepai
r
s and filespe
c
s
i
n our mem_p
o
ol
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newren
di
f
fc
o
re-re
n
ame,
m
e
rge
-
ort: ad
d
wrappe
r
functions
for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
E
lijah Newren
m
erge-ort: switch ou
r
str
m
aps o
v
er to using memory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newren
merge-ort: set up a mem
o
r
y
p
ool
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newren
me
r
ge
-
o
rt: add pool_
a
llo
c
, pool_calloc,
a
n
d
pool_strndup
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
Elija
h
Newren
diffcor
e
-renam
e
: use
a
m
e
m_p
o
ol
f
or e
x
act
r
e
name dete
c
tion
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
E
l
i
jah Newren
merge-ort: rename st
r
{map,intmap,set}_
f
unc()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-22
Elijah Newren
pull: fix handling
o
f
multiple head
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-22
Elij
a
h
New
r
en
pull: update docs & code for option c
o
mpatibilit
y
with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-22
Elijah
N
e
wren
pull: abort b
y
default when fast-
f
orwarding is not
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-22
El
i
j
ah Newr
e
n
pull
:
make --reba
s
e and --no-rebase override pull
.
ff
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-22
Elijah Newren
p
u
ll: since --ff
-
o
nly over
r
i
de
s
, hand
l
e it
f
i
rst
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-21
Elijah Newren
t760
1
: add tes
t
s
of i
n
teraction
s
with multiple merge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-21
Elij
a
h Newren
t7601: test interaction of
merge/r
e
b
ase/fast-forw
a
rd
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
Elijah
N
ewren
mer
g
e
-ort: restart merge
w
ith cach
e
d renames to r
e
duce
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newren
merge-ort: avoid re
c
u
r
sing into
d
i
rectorie
s
when we
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
E
lijah Newren
merge-ort
:
defer
recurs
i
ng i
n
t
o dir
e
ctories when merge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newre
n
merge
-
ort: add a handle_def
e
rred_entri
e
s() helper function
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newren
me
r
g
e-ort: add data s
t
ru
c
tures
for allowable tr
i
vial
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
El
i
jah New
r
en
merge-o
r
t: add s
o
me more expl
a
nations in
collect_merge_info_
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
E
l
ijah Newr
e
n
merge-ort:
r
e
solve paths ear
l
y when
w
e
have sufficient
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-15
E
lijah Newren
ren
a
me: bump limit defaults
yet again
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-15
E
l
ijah
N
ewren
diffcore-renam
e
: treat a rename_limit of 0
a
s
u
n
limi
t
ed
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-15
E
lijah
Newren
doc:
c
larify documentation for rename/
c
opy
l
imits
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-15
Elijah Newren
diff: c
o
rrect warning message when r
e
name
L
imit exceeded
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-30
Eli
j
ah Newren
merge-recu
r
sive:
handl
e
rename-to-self
c
as
e
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-30
E
lijah Newren
merge-ort: ens
u
re
we co
n
sult df_confli
c
t
and
path_conflicts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-30
Elijah
New
r
en
t
6
4
23: tes
t
direct
o
ry
rename
s
causing rename-to
-
self
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-28
El
i
j
ah N
e
wren
m
e
rge
-
ort: add prefet
c
hing for
c
ontent merges
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-28
Elijah Ne
w
ren
diffcore-r
e
name: use
a
d
i
fferent prefetch for
b
asename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-28
Elijah New
r
en
diffcore
-
rename:
allow
d
i
fferent
missing_ob
j
ect_cb
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-28
E
l
ijah Newren
t6421:
a
dd tests che
c
k
i
ng
f
or excess
i
ve object
downloads
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-16
Elij
a
h
Newren
promi
s
or-
r
em
o
te: output trace
2
statistics fo
r
n
u
mber
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next