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
dir: add a usage note to exclude_per_dir
2022-01-17
Elij
a
h Ne
w
ren
merge-o
r
t:
avoid ass
u
ming all
r
en
a
mes det
e
c
t
ed
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
Elijah
Newr
e
n
Accelerate clear_skip_worktree_from_pres
e
nt_fi
l
es(
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newre
n
Update do
c
um
e
ntat
i
on related to sparsit
y
and the skip
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
Eli
j
a
h Newren
r
e
po_read_in
d
ex: clear SKIP_WORKTR
E
E bit from fil
e
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newren
un
p
ack
-
trees: fix accidental loss of
us
e
r changes
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
Elij
a
h N
e
wren
t1011: add testcase demonstra
t
in
g
accidental
l
oss
o
f
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-04
Elijah Newren
s
t
ash: do not re
t
ur
n
b
e
fore restoring
untr
a
c
ked fil
e
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-30
Eli
j
ah Newren
m
e
rge-or
t
: fix bug with renormalization and r
e
na
m
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-23
Elijah Newren
spars
e
-ch
e
ck
o
ut: rem
o
ve str
a
y trailing
space
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
N
ewren
clone: avoid using
d
eprecated `sparse-checkout
init`
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
E
lijah New
r
e
n
D
ocumentat
i
on: cla
r
i
f
y/correct
a
few
sparsity
r
e
lated
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elij
a
h N
e
wren
git-spars
e
-check
o
ut
.
txt:
u
pd
a
te to
document
init/set
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
s
p
arse-check
o
ut:
enabl
e
reapply to t
a
ke --[no-]{cone
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elija
h
Newr
e
n
sparse-c
h
eckout: enable
`
se
t
` t
o
initia
l
ize sparse
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
N
ewren
sparse-c
h
ecko
u
t: split out code
for t
w
eak
i
ng settin
g
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
sparse-checkou
t
: disal
l
ow --no-stdin
a
s
a
n
a
rgume
n
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
E
lijah
N
ewren
sparse-checko
u
t: add
s
anity-
c
hecks on in
i
t
ial sparsity
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
Newren
sparse-checkou
t
: break apart functions for
sparse_
c
heckout
_
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
E
lijah N
e
wren
sparse-chec
k
ou
t
: p
a
ss use_
s
tdin as a parameter
i
nstead
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Ne
w
ren
t
2
501: simplify the tests
since we can now assume
d
esi
r
ed
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
El
i
j
ah Newren
dir: new flag t
o
remo
v
e_d
i
r_re
c
urs
e
() t
o
s
pa
r
e th
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
El
i
jah N
e
wren
dir: avoid i
n
cidentally r
e
moving the original
_
cwd
in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
N
ewren
sta
s
h: do
n
o
t attempt
to remove start
u
p_info
-
>origi
n
al_cw
d
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
re
b
ase:
d
o not attempt
to remove
s
tartup_
i
n
fo->original_cw
d
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
N
ew
r
en
clean: do not attempt to remov
e
startu
p
_i
n
fo
-
>original_cwd
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elija
h
Newren
symlinks: do n
o
t include
s
t
a
rtup
_
inf
o
->original_cwd
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
N
e
wren
unpack-
t
rees: add sp
e
cial cwd hand
l
in
g
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elij
a
h Newren
unpack-t
r
ee
s
: r
e
fuse to remove s
t
artup_inf
o
->original_cwd
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elij
a
h New
r
e
n
setup: introduce startup_info->original_cwd
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
E
l
ijah Newr
e
n
t250
1
: add various
t
ests for
removi
n
g the current worki
n
g
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-05
Elijah Newr
e
n
seq
u
e
ncer: do not e
x
port GIT_DIR and GIT_
W
ORK_TREE
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-05
E
l
ijah Newren
name-rev: pr
e
fer shorter n
a
mes ove
r
follow
i
ng mer
g
es
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-01
E
l
i
j
ah Newren
upd
a
te documenta
t
ion for
n
e
w zdiff3 conf
l
ict
S
tyle
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-11-30
Elijah Newr
e
n
sequenc
e
r: av
o
id
a
dding exec comman
d
s for
n
on-comm
i
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elij
a
h Newren
Documentat
i
on: ca
l
l out
co
m
mands that nuke u
n
tr
a
cked
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah N
e
wren
C
o
mment important codepaths regarding nuking u
n
tracked
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
E
l
i
jah Newre
n
unpack-trees: avoid nukin
g
untracked dir in wa
y
o
f
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
un
p
ack
-
t
r
ees: avoid nuk
i
ng untr
a
c
ked dir in way of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elija
h
N
e
w
ren
Cha
n
ge unpac
k
_
t
re
e
s
' 'reset' flag
int
o
an enum
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah
N
ewren
Remove ignored
files by
default whe
n
they a
r
e in the
w
a
y
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah
Newren
unpack-trees: make
d
i
r
an int
e
rnal-only struct
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
unpa
c
k-trees: introdu
c
e preserve_i
g
no
r
ed to un
p
ack_trees_o
p
tions
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
E
l
ijah
N
ewren
r
e
ad-tree, mer
g
e-recursive: overwrite i
g
nore
d
f
i
les
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
c
heckou
t
, read-tree: fix leak of un
p
ack_trees_options
.
dir
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-24
Elijah Newren
t2500: add various tests for nuk
i
n
g
untrac
k
ed fi
l
es
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-20
Eli
j
ah
Newren
m
erg
e
-ort: fix completely wron
g
comm
e
nt
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-20
Elij
a
h Newren
trace2
.
h: fix trivial co
m
ment typ
o
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-12
El
i
jah Newren
test
s
: rem
o
ve leftover untracked fi
l
es
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-10
Elijah Newren
am:
f
i
x
i
nco
r
rect ex
i
t
s
tatus on a
m
fail to abort
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-10
E
lijah New
r
e
n
t4151: add a f
e
w am
--abort tests
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-10
Elijah Ne
w
ren
git-am
.
txt: clarify --abort
behavior
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-10
Elijah Newren
stash
:
restore untr
a
cked
f
iles AFTER r
e
storing tr
a
cked
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-10
E
l
ijah Newren
stash: avoid feeding directories
t
o update
-
index
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-10
Elijah Newren
t3903:
d
o
c
ument a pair of
d
i
rectory/file bugs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elijah
N
ewren
U
p
date d
o
cs for cha
n
g
e
of de
f
ault merge ba
c
kend
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elijah New
r
en
Change default mer
g
e backend
from recursive to or
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
Update error message and code
c
omment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
merge-strategies
.
txt: add coverage of the `
o
rt` merge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
Eli
j
ah Newren
git-
r
ebase
.
txt: correct out-
o
f-d
a
t
e
and misleadi
n
g
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
m
erge-
s
t
r
a
t
e
gies
.
txt:
fix
s
i
mpl
e
c
api
t
aliza
t
i
o
n error
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
Eli
j
a
h
N
ewr
e
n
merge-stra
t
eg
i
es
.
txt:
a
void g
i
v
i
ng special preference
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elij
a
h Newren
me
r
ge-strategies
.
t
x
t: do not
i
mp
l
y usin
g
c
o
py detection
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Ne
w
r
e
n
merge-
s
trat
e
gies
.
txt:
update wording for the res
o
lve
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elija
h
N
e
wren
D
ocumenta
t
ion: edit awkward refer
e
nces to `git merg
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
Elijah
N
ewren
directory-renam
e
-detection
.
txt: smal
l
updates due to
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
E
l
ijah Newren
git-re
b
ase
.
t
xt:
c
orr
e
ct ant
i
quated c
l
aims
about
--rebase
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-03
El
i
j
ah Newren
m
e
rge-ort: remove compi
l
e-tim
e
abil
i
ty to turn
o
f
f
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
Elij
a
h Newren
merge
-
ort: r
e
us
e
path
s
trings in po
o
l_alloc_filespec
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newren
merge-ort: s
t
o
r
e filepa
i
rs a
n
d filespecs in ou
r
mem_pool
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newren
di
f
fcor
e
-rename
,
merge-ort:
a
dd wrapper functions for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newren
merge-ort: switch ou
r
strmaps o
v
er
to using memo
r
y
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
E
l
ijah
Newren
mer
g
e-
o
rt
:
set up a memory pool
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
E
l
ijah Newren
mer
g
e-o
r
t: add pool_alloc, pool_calloc,
a
n
d
p
o
ol_strndup
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
Elijah
N
ewren
diffcore-rename: us
e
a mem_pool for exact rename d
e
tection
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-30
Elijah
N
ewren
merge-ort:
r
ename str{map,int
m
a
p,set}_f
u
n
c
()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-22
El
i
jah
N
ewr
e
n
pull: fix han
d
ling o
f
mult
i
p
l
e heads
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-22
Elijah New
r
en
pull: update docs & code for
o
p
t
ion compatibility
with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-22
Elijah Newren
pull: abort by
d
efaul
t
wh
e
n fas
t
-forwar
d
ing is
n
o
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-22
E
lij
a
h Newr
e
n
p
ull: make -
-
rebase a
n
d --
n
o-re
b
ase override pull
.
ff
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-22
Elijah N
e
w
r
en
pull:
s
i
n
c
e
-
-ff-only overrides, handl
e
i
t fir
s
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-21
Elijah New
r
en
t76
0
1
:
add tests of interactions with
multipl
e
merge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-21
Eli
j
ah Newr
e
n
t7601:
test interaction of merge/reba
s
e/fast
-
forward
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newren
merge-ort:
r
estart
m
e
rge
w
ith ca
c
h
e
d renames to re
d
uce
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
E
l
ijah
N
ewr
e
n
merge-ort:
avoid r
e
cur
s
ing int
o
dire
c
tories when we
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
Elijah N
e
wren
merge-ort: defer recursi
n
g into d
i
rectori
e
s when me
r
ge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
E
l
ijah Ne
w
ren
merge-ort: add
a ha
n
dle_deferred_en
t
ries() help
e
r
fu
n
c
t
ion
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
Elijah New
r
en
mer
g
e-ort: add
data structu
r
es for
allowable trivial
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
E
l
ijah Newren
m
erge
-
ort: add some more explanations
in collect_m
e
rge_inf
o
_
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newren
merge-ort: resolve p
a
t
h
s earl
y
when we have sufficient
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-15
Elijah Ne
w
r
e
n
renam
e
: bump limit defaults ye
t
ag
a
in
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-15
Elijah Newren
d
i
f
fcore-rename: treat a rename
_
limit of 0 as u
n
limi
t
ed
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-15
Elijah Newren
doc: clari
f
y
documentatio
n
for rename/copy limits
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-07-15
Elijah Newre
n
diff: c
o
r
r
ect warning
messag
e
when r
e
nameLimit excee
d
ed
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-30
Elijah Newren
merge-recu
r
s
i
ve: hand
l
e rename-to-self case
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-30
Elijah N
e
wren
merge-o
r
t: ens
u
re we consult df_c
o
nflict and path
_
c
onfl
i
cts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-30
Elijah Newren
t6423: test
directory renames
c
ausing re
n
ame-to-self
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-28
El
i
j
a
h
Newre
n
m
erge-ort: add prefetching fo
r
content me
r
ge
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-28
Elijah Newre
n
d
iffcore-rename: use a diff
e
rent prefetch for basename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-28
Elijah
N
ewren
diffcore-rename: allow different missing_object_c
b
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-06-28
El
i
jah
Newren
t6421:
add tests che
c
king for ex
c
essi
v
e object
downl
o
ads
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next