repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mingw: avoid mktemp() in mkstemp() implementation
2022-01-26
Elijah
Newr
e
n
sequencer, stash: fix runni
n
g f
r
om
w
orkt
r
e
e
subdir
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-04
Elijah Newren
s
t
a
s
h: do not return before
restori
n
g untracked files
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-30
Elijah Newren
m
erge-ort: fix bug wi
t
h renormalization and rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-23
E
l
i
j
ah Newren
sparse-
c
heckou
t
: remo
v
e
s
tray t
r
ail
i
n
g spac
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
clone: avo
i
d
u
sing
d
eprec
a
ted
`
sparse-checkout ini
t
`
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah N
e
w
r
e
n
Documentatio
n
:
c
la
r
ify/correc
t
a few spar
s
ity
r
ela
t
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
git-sparse-checkout
.
txt: up
d
ate to document init/set
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
s
parse-
c
heckout:
enable reapply to t
a
ke --[no-
]
{cone
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah N
e
wren
spar
s
e
-checkout: enab
l
e `set
`
to ini
t
iali
z
e s
p
ar
s
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elij
a
h
Newren
sparse-checko
u
t: split out code for t
w
eaking
s
ettings
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
New
r
en
sp
a
rse-
c
heckou
t
: disallow --no-stdin as an argument
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah New
r
e
n
sparse-checkou
t
: ad
d
sanity-checks o
n
initial spa
r
sity
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elij
a
h
Newr
e
n
sparse-checkout: break apart functions for sp
a
rse_checkout_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
N
ewre
n
sparse-ch
e
c
kout: pass use_std
i
n as
a parameter inst
e
a
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
l
ijah Ne
w
ren
t2
5
0
1: simplify
t
he test
s
sin
c
e we can now a
s
su
m
e
d
e
sired
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
Newren
dir: new flag to re
m
o
v
e_dir
_
recurs
e
() t
o
spar
e
t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
Newren
di
r
: avo
i
d incidentally remov
i
ng the original
_
cwd in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
stash: do not att
e
mpt to re
m
ove startup_info->ori
g
inal_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
El
i
ja
h
Newr
e
n
rebase: do not attempt t
o
r
e
mov
e
startup_info->ori
g
in
a
l_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
c
l
e
an: do not at
t
empt to
r
emove st
a
rtup_in
f
o->o
r
iginal_
c
wd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elij
a
h Newren
symlinks: do not include st
a
rtup
_
i
n
fo->o
r
iginal
_
cwd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
Newre
n
unpack-t
r
ees: add
s
pe
c
ial cwd handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elij
a
h Newren
unpack-trees: refuse t
o
r
emove startup_
i
nfo->original_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
l
ijah N
e
wren
setup: introduce s
t
a
rtup_info->original
_
cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Eli
j
ah Newren
t2501: a
d
d various tests for removin
g
t
h
e current
wor
k
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-05
E
li
j
ah Newren
sequencer: do
not
e
xpo
r
t GIT
_
DI
R
and G
I
T_
W
ORK_TREE
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-05
Elijah Newren
name-rev:
p
refer short
e
r names over f
o
llowin
g
merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-01
E
lijah Newren
update docum
e
ntation
for new zdif
f
3 c
o
nf
l
i
c
t
S
tyle
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-11-30
Elijah Newren
sequ
e
n
cer
:
a
void
addi
n
g exec comm
a
nds for non
-
commit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah N
e
wren
Documentati
o
n: call out commands that nuk
e
untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
El
i
j
ah Newre
n
Co
m
ment importa
n
t co
d
epaths re
g
arding
n
u
k
ing untr
a
c
ked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah N
e
wr
e
n
unpac
k
-trees: avoid
nuking
untra
c
ked dir in way of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Eli
j
ah
N
ewren
unpack-trees: avoid nuking
unt
r
acke
d
d
ir in
way of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
E
l
ijah Newren
Change unpack_
t
ree
s
' 'res
e
t' flag into an enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
Rem
o
ve ign
o
red files by default when they ar
e
in the way
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
El
i
jah Newren
un
p
ack-
t
rees:
m
a
ke d
i
r
a
n internal-only struct
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
unp
a
c
k-trees: int
r
oduce preserve_ignored t
o
unpack_trees_options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elij
a
h Newren
read-tree,
merge-
r
ecurs
i
ve: overwrite
ignor
e
d
files
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah
N
ewren
c
he
c
kout
,
read-tree: fix
leak of u
n
pac
k
_trees_op
t
ions
.
dir
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-24
Elijah
N
e
wre
n
t
2
500:
add various t
e
sts for nuking un
t
racked
f
i
les
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-20
Elijah Newren
merge-ort: fix
completel
y
wron
g
com
m
e
n
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-20
Elijah Newren
trace2
.
h
:
f
ix trivial comment typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-12
Elijah Newre
n
tests
:
remov
e
leftover untracked files
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah
Newren
a
m: fix
incorrec
t
e
x
i
t status on am fail to a
b
o
rt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
E
l
i
j
ah New
r
en
t4151: add a few am --abort tes
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah New
r
en
git-
a
m
.
txt: cla
r
ify --ab
o
rt behavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elija
h
N
ewren
st
a
sh:
rest
o
re untracke
d
files AFTER restoring track
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elija
h
New
r
e
n
s
t
ash: avoid feeding
d
irector
i
es to update
-
index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elija
h
Newren
t3903: document a pa
i
r
of d
i
rectory
/
file bugs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
El
i
j
a
h Newren
Update docs for chang
e
of d
e
f
ault me
r
ge backend
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
E
l
ijah Newren
Change default merge backend
f
rom recursive
to ort
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newre
n
Up
d
ate error mess
a
ge a
n
d
code comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Eli
j
a
h N
e
wren
merge-strategies
.
txt: ad
d
coverage of the
`ort` merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
git-rebase
.
txt: co
r
rect out-of-date and misleading
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
E
l
ijah
N
e
wren
m
e
r
g
e-stra
t
e
g
ies
.
txt: fix simple
c
a
p
i
t
al
i
zation error
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Eli
j
ah Newr
e
n
merge-strateg
i
es
.
txt
:
avoid g
i
v
i
n
g
special preference
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah
N
ewre
n
m
e
rge-s
t
rategies
.
txt: do not imply using c
o
py
d
e
t
ection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
mer
g
e
-s
t
rategies
.
txt:
update
w
ording for the res
o
lve
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah
Newren
Docu
m
en
t
ation: edit awkward
r
e
f
erences to `git merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
directory-rename-detec
t
ion
.
t
x
t
:
sma
l
l
updates
due to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah
Newren
git-rebase
.
t
x
t: co
r
rect an
t
iqu
a
ted claims about --re
b
ase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-03
Elijah Newren
merg
e
-ort:
r
e
m
ove compile-time abi
l
ity to tu
r
n off
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newren
m
e
rge
-
ort: reuse path st
r
ings in
p
o
o
l_alloc_
f
ilespec
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newren
merge-
o
rt: store filepairs and filespecs in o
u
r mem_pool
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newr
e
n
diffcore-rename, m
e
rge
-
o
rt: ad
d
wrapper functions for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
E
lijah
Newren
me
r
ge-ort: s
w
i
tch our
s
trmaps
over
to us
i
ng me
m
or
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elij
a
h
N
ew
r
en
merge-or
t
: set up
a
memor
y
p
o
ol
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newren
mer
g
e
-ort: add pool_allo
c
,
p
ool_ca
l
loc
,
and p
o
ol_strndup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah
N
e
w
ren
diffcore-rename: u
s
e
a mem_pool for exact rename detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
El
i
ja
h
Newren
mer
g
e-ort: rename str{map,intmap
,
set}_fu
n
c()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
E
l
ijah Newren
pull: fix hand
l
i
ng
o
f
multipl
e
h
eads
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
Elijah Ne
w
ren
pull: update docs & co
d
e for option compatibility wi
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
Elijah N
e
wren
pull:
a
bo
r
t
by default wh
e
n fast-forward
i
ng is n
o
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
Elija
h
Ne
w
r
e
n
pull: make --rebase a
n
d --no-reb
a
se over
r
ide
p
ull
.
ff
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
Eli
j
ah Newren
pull: s
i
n
c
e --ff-on
l
y overr
i
de
s
,
handle it first
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-21
E
l
ijah Ne
w
ren
t7
6
01:
a
dd t
e
s
t
s
of intera
c
tions
w
ith multiple merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-21
Elijah New
r
en
t7601: test
i
nteraction of
m
erge/r
e
base/fast-forward
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elija
h
Newren
merge-or
t
: res
t
art merge with
c
ached renames
to r
e
duce
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elij
a
h N
e
wren
merge-ort: av
o
i
d recurs
i
ng int
o
dir
e
ctories w
h
e
n we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newren
merge-o
r
t: defer rec
u
rsing int
o
directories when
m
erge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
El
i
j
a
h Newren
me
r
ge-ort:
add a handle_deferred_entr
i
es() helper fu
n
ction
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
E
l
ijah Newren
m
e
rge-or
t
: a
d
d data struct
u
res fo
r
allowable
t
ri
v
ial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah N
e
w
r
en
m
e
rge-
o
rt: add some more explanations in colle
c
t_merge_in
f
o_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah
Newren
merge-
o
rt: resolv
e
p
a
t
hs early wh
e
n we
h
a
ve s
u
fficien
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
E
l
ijah N
e
w
re
n
rename: bump limit d
e
fault
s
yet a
g
ain
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
Eli
j
a
h
N
e
wren
diff
c
ore-
r
en
a
me:
t
re
a
t a renam
e
_limit o
f
0
a
s
unlimited
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
Elijah Newren
doc: clarify documenta
t
i
on
f
or ren
a
me/copy limits
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
E
lijah
N
e
w
r
e
n
d
i
ff: correc
t
warning message when renameLimit e
x
cee
d
ed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-30
E
lijah Newren
merge-recu
r
sive: handl
e
re
n
ame-
t
o-self case
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-30
Eli
j
a
h New
r
en
merge-ort: ensure we consult df_conflic
t
and
p
ath_co
n
fl
i
cts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-30
Elij
a
h Ne
w
re
n
t6423: test dir
e
ctor
y
ren
a
mes
causing renam
e
-
t
o
-s
e
lf
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
Elijah Newren
mer
g
e-or
t
: add pre
f
e
tching for c
o
nte
n
t merge
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
Elijah Newren
di
f
fcore-ren
a
me: use a dif
f
erent
prefetch for
basename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
E
lijah
N
ew
r
en
diff
c
ore-rename: a
l
low
different missing
_
object_cb
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
E
l
ijah Ne
w
ren
t6421: add tests check
i
ng for e
x
cessive
o
bject downloads
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-16
Elijah Newren
promis
o
r-remote
:
output
trace2
statistics for
number
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
Elijah New
r
en
merge-ort: miscella
n
eo
u
s touch-
u
p
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
Elijah Newren
Fix va
r
ious issues fou
n
d
in comments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
Elijah
Newren
d
i
ff
c
ore-
r
ename: a
v
oid un
n
e
c
es
s
ary strdup'i
n
g in
break_idx
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
E
lijah Newren
m
erge-ort:
r
eplace string
_
list_df_name
_
comp
a
re with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next