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
Merge branch 'ma/windows-dynload-fix'
2022-01-04
Elijah
N
ewren
stash: do n
o
t return
b
e
f
o
re re
s
toring untracked fi
l
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-30
Elijah
N
ewren
merge-ort: fix bug with renormaliza
t
ion and rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-23
Elij
a
h New
r
en
sparse
-
checkout: remove
s
t
r
a
y trailing spa
c
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elij
a
h Newren
c
lone: avoid using depre
c
ated
`
s
pa
r
s
e
-check
o
ut init`
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
Newren
Documentat
i
on: cla
r
ify/correct a few
sparsity
related
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah N
e
wre
n
g
it-sparse-che
c
kout
.
txt: update
t
o docu
m
ent init/set
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elij
a
h Newren
s
p
ar
s
e-checko
u
t:
e
nable reapply to take --[no-]{c
o
ne
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
E
l
ijah
N
ewren
sparse-che
c
kout: enable
`set`
to initia
l
i
ze sparse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
sp
a
rs
e
-checkout: spl
i
t out co
d
e
for tweaking setti
n
gs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
E
l
ijah Newr
e
n
sparse-checkout: disallow --no-stdin
as an arg
u
men
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
spars
e
-checkout: a
d
d sanity-checks
o
n in
i
t
ial sparsi
t
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
El
i
jah
Newr
e
n
sparse-che
c
k
out
:
break apart functions for s
p
arse
_
checkout
_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah New
r
en
sparse-checkout: pass use_stdin as a par
a
m
e
t
er instead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
t
2501:
simplify the test
s
s
ince we
can now assume des
i
red
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
di
r
: new flag to remove_dir_r
e
curse() to spare the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
dir
:
avoid incidentally removin
g
the original_cwd in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
N
ewren
stash:
d
o not atte
m
pt
t
o remo
v
e startu
p
_in
f
o
-
>or
i
ginal_c
w
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
N
e
w
ren
rebase: do
n
ot attempt to
remove
startup_
i
n
f
o->original_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
cl
e
a
n
:
do not
a
ttempt to remove sta
r
tu
p
_info->origin
a
l_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
sy
m
li
n
ks: do n
o
t include startup
_
info->or
i
ginal
_
c
w
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
Newren
unpack-trees: add special cwd h
a
ndling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
l
ijah Newre
n
unpack-trees: refuse to remove start
u
p_info-
>
o
riginal_c
w
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newre
n
setup
:
introduce startup_i
n
fo->original
_
cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elija
h
Newr
e
n
t2501: ad
d
va
r
i
o
us tests for removi
n
g the current wor
k
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-05
E
l
ijah Newren
sequencer: do not
export G
I
T_DIR
and
G
I
T_
W
O
RK_TREE
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-05
Elijah Newren
name-rev: pre
f
er
s
hor
t
er names ove
r
following
m
e
r
g
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-01
El
i
jah N
e
w
r
en
upd
a
te do
c
ument
a
tion
f
o
r new zdif
f
3
c
onflictStyle
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-11-30
Eli
j
ah N
e
wren
sequencer: avoid a
d
ding exec commands for non-commi
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Eli
j
ah N
e
w
ren
Documentation: call out commands that nuke
u
ntr
a
cked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
El
i
jah Newren
Commen
t
importa
n
t codepaths reg
a
rd
i
ng nuking
unt
r
acked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elija
h
Newren
u
n
pack-t
r
ees: avoi
d
nuking
untracked dir in way of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newre
n
unpack-tr
e
es: a
v
oid nuki
n
g u
n
track
e
d dir i
n
way of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah N
e
wren
Change unpack
_
tre
e
s'
'
reset' flag
i
nto a
n
enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
E
l
ijah Newren
R
emove ignored files by default
w
h
en they ar
e
in th
e
way
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah
N
ewren
unpack-trees: make dir
a
n internal
-
only struct
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Ne
w
ren
unpack-tree
s
: introduce preserve_ignored
t
o
unp
a
ck_
t
rees_options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Eli
j
ah Newren
read-t
r
ee, merge
-
recursive: overwrite ignored files
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Ne
w
ren
c
heckout, read-tr
e
e
:
fix lea
k
of unpack
_
trees_opt
i
ons
.
dir
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-24
Elijah Newren
t25
0
0: add va
r
i
o
us tests for nu
k
ing un
t
ra
c
k
e
d
f
i
les
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-20
E
lijah Ne
w
ren
merge
-
ort: fix completely wrong comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-20
Elijah Newren
t
r
ace2
.
h: fix
trivi
a
l
co
m
ment typ
o
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-12
Eli
j
ah Newre
n
tests: re
m
ove lef
t
o
ver u
n
trac
k
ed files
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah
Newren
am:
fix incorrect
exit
s
tatus on am fail to abort
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah Newren
t
415
1
: add
a fe
w
am --a
b
ort
t
e
sts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elij
a
h
Ne
w
ren
git
-
a
m
.
txt: c
l
arify
--
a
bort behavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah Newren
stash: re
s
tore un
t
racked files AFTER rest
o
ring tracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
E
lijah Newren
s
t
ash:
a
vo
i
d feeding
d
irectorie
s
t
o
u
pdate-inde
x
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah Newren
t3903: document a pair
o
f director
y
/fil
e
b
ug
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah New
r
en
Update docs for change of defa
u
l
t merge backend
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
El
i
ja
h
N
e
wren
Change default merge backe
n
d fro
m
re
c
ursive to ort
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Ne
w
ren
Update
error m
e
ssag
e
and code comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
El
i
jah
N
ewren
merge-strat
e
gies
.
t
x
t:
add coverage
o
f
the `ort` merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
E
lija
h
Newren
g
it-rebas
e
.
txt: correct o
u
t
-of-dat
e
and
m
isleadi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
El
i
jah Newr
e
n
merge-strate
g
ies
.
t
xt: fix simple capitalization
erro
r
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
m
erge
-
strategies
.
tx
t
:
a
v
oid giving special preference
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
merge-strategies
.
txt:
do
n
ot imply
using c
o
py detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
E
l
ijah Newren
merge-stra
t
egies
.
txt: update wording for
the
resolve
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
E
l
ij
a
h
Newren
Documentation: edit a
w
kward re
f
erenc
e
s to `git merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
El
i
jah Ne
w
ren
directory
-
rename-detectio
n
.
txt:
small
upd
a
te
s
due to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah
Ne
w
ren
gi
t
-rebas
e
.
txt:
correct antiquated claims about
--rebase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-03
Elijah
Newre
n
merge
-
or
t
: remove comp
i
le-t
i
me
ability to turn o
f
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elija
h
N
e
wren
merge-ort: reuse path string
s
in po
o
l_a
l
loc_fil
e
spec
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah
Newren
m
er
g
e-ort: store fil
e
pairs and filespecs in our mem_pool
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
E
lijah N
e
wren
diffco
r
e-rename, me
r
ge-ort: a
d
d wrapper
f
unctions fo
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah
Ne
w
ren
merge-ort: sw
i
tch
o
ur st
r
maps over to using memory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
E
lijah Newren
m
er
g
e-
o
r
t
: set up a memory
p
ool
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
E
lijah Ne
w
ren
m
er
g
e-o
r
t: add pool_allo
c
, pool_ca
l
loc, an
d
pool_st
r
n
d
up
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah N
e
wren
diffcore-rename: use a mem_pool for exact
r
ename detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
E
l
i
jah
Newre
n
merg
e
-or
t
: rename
s
tr{map
,
intmap,set}_func
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
Elijah Newren
p
u
l
l
: fi
x
handl
i
ng
o
f
m
ultiple h
e
ad
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
Elija
h
N
e
wre
n
pull
:
update
docs & code for option compatib
i
lity wi
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
Eli
j
a
h
Newre
n
pull: abort by defa
u
l
t when fast-forw
a
rding is not
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
E
lijah Newren
p
u
l
l:
m
a
k
e --rebase and
-
-n
o
-
rebase o
v
err
i
de pull
.
ff
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
E
l
ijah Newren
pull: since --ff-only override
s
, ha
n
dle i
t
fir
s
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-21
Elijah Newren
t76
0
1: add tests of interactions with multiple merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-21
Elijah N
e
wren
t7601: test inter
a
ction of merge/rebase/fast-forward
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
E
lijah Newren
me
r
g
e
-
o
rt
:
restart merge with cache
d
ren
a
mes to reduce
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newren
merge
-
o
r
t: avoid
recursing into direct
o
ries when we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newr
e
n
merge-ort: defer recursing
int
o
direct
o
ries whe
n
merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
E
lijah Newren
merge-ort:
a
dd
a hand
l
e_deferre
d
_e
n
t
ries
(
) helper fun
c
tio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newre
n
m
erge-ort: ad
d
data structures for allowab
l
e
t
rivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newre
n
m
e
rge-or
t
: add some mo
r
e expla
n
ations in c
o
llect_merge_inf
o
_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah N
e
wren
m
erge-or
t
: re
s
olve p
a
ths
e
arly when we have sufficient
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
Elijah Newren
renam
e
:
b
u
m
p
limit defaults yet again
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
Elijah
Newren
diffcore-rena
m
e: treat
a
rename
_
l
imit of 0 as unl
i
mited
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
E
lijah Newren
doc: clarify do
c
umentation
f
or rename/copy lim
i
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
Elijah Newre
n
di
f
f: correct warning message w
h
en rename
L
imi
t
exceeded
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-30
Elijah
N
e
wren
merge-recu
r
sive: handle rename-to-self case
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-30
E
l
ijah Newren
m
erge-ort: e
n
sur
e
we consul
t
df_
c
on
f
li
c
t an
d
path_conflict
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-30
Elijah Newren
t6423
:
t
e
st di
r
ect
o
ry rename
s
causing
rename-to-se
l
f
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
Elij
a
h
N
ewren
mer
g
e-ort
:
add
p
refetching for con
t
ent
m
er
g
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
E
lijah
N
ewren
diffcor
e
-rename: use a di
f
ferent pre
f
etch for basename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
Elija
h
Newr
e
n
d
i
ffcore-rena
m
e: al
l
ow dif
f
eren
t
missing_object_cb
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
Elijah Newren
t6421: add
t
ests c
h
e
c
k
ing fo
r
excessive
object dow
n
loads
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-16
El
i
jah New
r
e
n
p
r
o
m
i
s
o
r-re
m
ote: output trace2
statistics
f
or number
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
Elijah Newren
me
r
ge-ort: miscellaneou
s
t
ouch-ups
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
E
lij
a
h Newr
e
n
Fi
x
vario
u
s issu
e
s found in com
m
en
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
Elijah Newren
diff
c
ore-
r
e
name: avoid unnecessary strdup'ing i
n
b
reak_idx
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
Elijah Newren
m
erg
e
-ort: replace string_list_df_name_com
p
ar
e
wi
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-27
Elijah
Newren
dir: int
r
oduce readdir_s
k
ip_
d
o
t
_and_
d
otdot
(
) helper
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next