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 tag 'l10n-2.35.0-rnd2' of git://github.com/git-l10n/git-po
2022-01-04
Elijah
N
ewren
stash:
d
o not ret
u
r
n
before restor
i
ng untracked files
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-30
E
l
ijah Newren
me
r
g
e
-ort: fix
b
ug with renorma
l
i
zat
i
on and r
e
na
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-23
Elijah Newren
sparse-
c
hec
k
out: rem
o
ve st
r
a
y trailing
space
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
cl
o
ne: avoid using deprecated
`
spars
e
-chec
k
o
u
t
init`
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
E
li
j
ah
N
e
w
re
n
Docume
n
tation: clarify/c
o
rrect a few sp
a
rsity related
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
E
lijah Newr
e
n
git
-
spars
e
-ch
e
ckout
.
txt: upd
a
te
t
o
docu
m
e
nt init/set
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
El
i
jah New
r
en
sparse-checkout: enable reappl
y
to
t
ake --[no-]{co
n
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Eli
j
a
h
N
e
w
re
n
sparse
-
checko
u
t
: enable `
s
et`
t
o initialize sparse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
sparse-checkou
t
:
s
p
l
it ou
t
c
ode
f
o
r
twea
k
in
g
setti
n
gs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
sparse-checkout: disallow --no-stdin as an
ar
g
ument
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
sparse-checkou
t
:
ad
d
sanity-checks on initia
l
sp
a
rsit
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
s
p
arse-che
c
ko
u
t
:
br
e
a
k a
p
a
r
t fu
n
c
tions
fo
r
spar
s
e_
c
h
e
ckout_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
sparse-
c
hecko
u
t: pass
u
s
e_stdin as a parame
t
er instead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
l
ij
a
h
Newren
t2
5
01:
simplify the tests sinc
e
we can now assume desired
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elija
h
Newren
dir: new fla
g
to
r
e
mo
v
e_dir_recu
r
se() to
s
pare
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
Ne
w
r
e
n
d
ir: avo
i
d
i
ncid
e
ntall
y
removi
n
g the original_c
w
d in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
stash: do not attem
p
t
to
remo
v
e
sta
r
tu
p
_info->origi
n
al_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
rebase: do not attempt to
remove sta
r
tup_i
n
fo-
>
ori
g
inal_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elij
a
h Ne
w
re
n
clean:
do not attempt to remov
e
startup_info->orig
i
nal
_
c
wd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
El
i
jah
N
ew
r
en
symli
n
k
s
: do n
o
t
include star
t
up_inf
o
->origi
n
al_cwd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
El
i
jah New
r
en
u
n
p
ack
-
trees: add special cwd handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
unpac
k
-trees: refus
e
to re
m
ove startup_in
f
o->original_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
setup: introduce
startup_info-
>
original_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
t2501: add various
tes
t
s for
r
emovin
g
the current
working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-05
El
i
jah Newren
sequencer: do
not export GIT_DI
R
and GIT_WORK
_
TREE
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-05
Elijah Newren
name-rev: pr
e
fer shorter
n
a
m
es over following me
r
ges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-01
Elija
h
Newren
update docume
n
tati
o
n for new zdiff3 conflictStyle
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-11-30
Eli
j
ah Newren
sequencer: avoid adding exec comman
d
s for non-commi
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
Documentation:
cal
l
out
c
o
mmands that nuke untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
Comment imp
o
rtant codepat
h
s
regarding nuking
u
ntracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah New
r
en
unp
a
ck-tre
e
s: a
v
oid nuking
u
ntracke
d
dir i
n
wa
y
o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah
N
ewren
u
npack
-
tr
e
es: avoid nuking untracke
d
dir in
way
o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
Change unpack_tre
e
s'
'reset' flag
into an e
n
um
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah N
e
wren
Rem
o
ve igno
r
ed
files
by defaul
t
when
they
a
re in the way
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newre
n
unpack-trees:
m
ake dir an internal-onl
y
s
t
ru
c
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
unpack-tree
s
: introdu
c
e pres
e
rv
e
_ignored to unpack_trees_
o
ptions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
read-tree, m
e
rge-recursive: overwrite
ignored
f
iles
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Ne
w
ren
checkout, re
a
d-tree: fix leak of
unpack_tre
e
s_op
t
ions
.
d
i
r
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-24
Elijah
Newren
t250
0
: add various tests for nuki
n
g
u
ntracked fil
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-20
E
l
ijah Newren
merge-ort
:
fix compl
e
tely wr
o
n
g
comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-20
El
i
jah Newren
trace2
.
h: fix
trivial comment t
y
po
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-12
Elija
h
Newr
e
n
tests: remove
leftover untrac
k
e
d files
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah
N
e
w
ren
am: fix in
c
o
r
rect
e
xit s
t
a
tus on
a
m
f
ail
to abort
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah
Newren
t415
1
: add a few am
--abort test
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah Newren
g
i
t-am
.
txt
:
clarify -
-
abor
t
be
h
a
vior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah Newren
stash: restore un
t
racked files
AFTER restori
n
g track
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah N
e
wren
stash: avoid feeding d
i
rectories to update-i
n
dex
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
El
i
jah N
e
wren
t3903
:
document a pair of direc
t
o
ry/fil
e
bugs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
Upd
a
te docs for change of defau
l
t
merge bac
k
end
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Eli
j
ah Newr
e
n
Change
default merge ba
c
kend
f
rom rec
u
rsiv
e
to o
r
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
Update
e
r
r
or message and c
o
de comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah
N
e
wren
m
erge-strate
g
ies
.
txt: add
c
overage
of t
h
e `
o
rt` merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Eli
j
ah N
e
wren
g
i
t-rebase
.
txt: correct out-of
-
d
ate and mislead
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newr
e
n
merge-strate
g
i
e
s
.
t
xt:
fix
simple
c
apitalizatio
n
error
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
merge-strat
e
gie
s
.
txt: avoid giving special preference
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
merge-stra
t
egie
s
.
txt:
d
o
not imply
using
c
o
py
detec
t
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
m
e
rge-s
t
rate
g
ie
s
.
t
xt: update wor
d
ing f
o
r th
e
r
e
so
l
ve
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
El
i
jah Newr
e
n
Docu
m
e
n
ta
t
io
n
:
edit awkwa
r
d re
f
erence
s
to `git merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Eli
j
ah Newren
dir
e
ct
o
ry
-
r
e
name-det
e
ction
.
txt: small updates d
u
e
t
o
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah
N
ewren
g
i
t-re
b
ase
.
t
x
t: co
r
r
e
ct
a
nt
i
quated
c
laims
a
bout --re
b
as
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-03
E
l
ijah New
r
en
merge-ort: remove co
m
p
il
e
-
t
i
m
e
abi
l
ity to turn off
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
E
l
ijah Newren
merge-ort: reuse path st
r
ings i
n
pool_alloc_filespec
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah
N
ewren
mer
g
e
-
ort: st
o
r
e filepairs and filespecs in o
u
r mem_po
o
l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newre
n
diffcore-rename, merge-ort: add wr
a
pp
e
r function
s
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elij
a
h
N
ewren
merg
e
-ort: switch o
u
r s
t
rmaps
over to using me
m
o
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Ne
w
ren
merge-ort: set up a
m
emo
r
y pool
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newren
m
erge
-
ort: add pool_alloc, po
o
l_call
o
c,
and pool_strndup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah N
e
wren
diffcore
-
rename: us
e
a mem
_
poo
l
for exact rename detectio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newr
e
n
merge-o
r
t: rename str{map,intmap,se
t
}
_func()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
Elijah Newren
pull: fix han
d
ling of multiple heads
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
Elijah Newren
pull: upda
t
e d
o
cs
&
code for opt
i
o
n
compatibility with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
Elij
a
h Newren
pull: abort by
def
a
ult when fast-forw
a
rding i
s
n
ot
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
El
i
jah Newr
e
n
pull: make --re
b
ase
a
nd -
-
no
-
rebas
e
override pull
.
ff
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
E
l
ijah
N
e
wren
pull: since --ff-only overri
d
es,
handl
e
it first
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-21
Elijah Newren
t7601: add tests of
i
n
t
era
c
tions
w
ith multip
l
e merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-21
E
lij
a
h Newren
t7601: test intera
c
tio
n
of
me
r
ge/rebas
e
/fast-forward
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Eli
j
ah New
r
en
merge
-
ort: restart
m
e
r
ge
with c
a
c
h
ed
renames t
o
reduc
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newren
me
r
ge-ort: avoid re
c
ursin
g
into directories when
w
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newr
e
n
merg
e
-ort:
def
e
r
r
ec
u
r
s
ing
i
n
t
o
d
ir
e
ctori
e
s when m
e
rge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah
Newren
merge-ort: add a han
d
l
e
_deferred_entries() helpe
r
function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
El
i
jah Newren
me
r
ge-o
r
t:
ad
d
data s
t
ruct
u
res for a
l
lowable
tri
v
ial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elij
a
h Newre
n
merge-ort: add some mo
r
e e
x
planat
i
ons in collect_merg
e
_info_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Ne
w
ren
merge-ort:
resolve paths ea
r
ly w
h
en we have sufficient
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
Elij
a
h Newren
re
n
ame:
b
u
mp limit de
f
a
ults yet again
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
Elij
a
h
Newren
diffcore-rename: treat a rename_limit o
f
0 as unlimited
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
Elijah Newren
doc: clarify documentation f
o
r rename
/
copy
l
im
i
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
E
l
i
j
ah Newren
d
i
ff
:
c
o
r
r
ect wa
r
ni
n
g
m
essage when re
n
ameLi
m
i
t
exceede
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-30
Elijah Newren
merge-
r
ecursive:
h
andle rename-to-sel
f
c
ase
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-30
Elij
a
h Newren
me
r
ge-ort: e
n
sure we consult df
_
conflict and p
a
th
_
confl
i
cts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-30
Elija
h
Newren
t6423: test
d
irectory renames ca
u
s
i
n
g renam
e
-to-self
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
Elijah
Newren
m
erge-ort: add pref
e
tchin
g
f
o
r
content merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
Elijah Newren
diffcore-rename:
us
e
a different pref
e
tch for
b
asename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
Elijah
N
ewren
di
f
f
co
r
e-r
e
name: a
l
low
d
ifferent mis
s
in
g
_obj
e
ct_c
b
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
Elijah Newren
t
6
421
:
ad
d
te
s
ts ch
e
cking for exc
e
ssiv
e
object down
l
oads
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-16
Eli
j
ah Newren
pro
m
iso
r
-remote: o
u
tput trac
e
2 statisti
c
s
for numbe
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
E
lijah
Newren
merge-ort: misc
e
llaneous touch-ups
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
Elijah Newr
e
n
Fix
v
arious issues
found in
c
omme
n
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
Elijah N
e
wr
e
n
di
f
fcore
-
r
enam
e
:
avoid unnecessa
r
y strdup'ing in break_idx
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
Elijah N
e
wren
m
erge-ort: repla
c
e str
i
ng_list_df_na
m
e_co
m
pare with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-27
Elijah
N
ewren
dir: introduce r
e
addir_skip_do
t
_
an
d
_dotdot() helper
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next