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 'lh/use-gnu-color-in-grep'
2021-12-23
E
lijah
N
ewren
sparse-check
o
ut
:
remove stray
t
railing space
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newre
n
clo
n
e
: avoid using deprecated `sparse-checkout in
i
t`
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
Documentation
:
clar
i
f
y
/
correct a
f
ew
sparsi
t
y related
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elij
a
h Newren
g
i
t-sparse-checkout
.
t
xt: update to do
c
umen
t
init/
s
et
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
sparse-check
o
ut:
e
n
a
ble reapply to take --[no-]{cone
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah New
r
en
sparse-ch
e
cko
u
t: en
a
ble `
s
et` t
o
initia
l
ize
s
parse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
N
ewren
sparse-checkout: s
p
lit out
code fo
r
tweaking settings
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
E
lija
h
Newren
spar
s
e-checkout: disal
l
ow --no-stdin as an argum
e
nt
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
spar
s
e-chec
k
out: add sanity-checks on initial sparsity
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah New
r
e
n
spa
r
se-checkou
t
:
bre
a
k apart functions
f
or
sparse_checkout
_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
Newren
spar
s
e-checkout
:
pass use_stdin as a para
m
et
e
r
instead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
t25
0
1
: simplify th
e
tests sinc
e
we can now assume
d
e
s
ired
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
El
i
jah
New
r
e
n
dir: new fl
a
g to remove_d
i
r_recu
r
s
e
()
t
o spare the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
l
ijah Newren
dir: avoid in
c
identally removing t
h
e origin
a
l_
c
wd in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
Newren
s
t
ash: do not attempt to
remove startup_inf
o
-
>original_
c
wd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
rebase: do not att
e
mpt to
r
emove
s
t
art
u
p_info-
>
o
r
igina
l
_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Eli
j
ah Newren
clean: d
o
not attempt to re
m
ove startup_info->original_cw
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
s
y
mlinks: do
n
ot in
c
l
ude startup_
i
nf
o
-
>
original_cwd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
unpack-trees
:
add special c
w
d handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Eli
j
a
h
New
r
en
u
npack-trees: ref
u
se to re
m
ove startup_info-
>
ori
g
inal_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
l
ijah Newren
se
t
up:
introduc
e
startup_i
n
fo->origi
n
al_cw
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
t2501: add various
tests for removing the curren
t
workin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-05
Elij
a
h
N
ewre
n
sequence
r
:
do no
t
export GIT_DIR and G
I
T_WORK_TREE
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-05
El
i
jah N
e
wren
name-rev: prefer shorter names over f
o
llowin
g
m
e
rges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-01
Elij
a
h Newren
update documentation for
n
ew
z
dif
f
3
c
onflictStyle
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-11-30
Elijah Ne
w
ren
s
equence
r
:
avoid adding exec com
m
ands for non-commit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
Documen
t
ation: call out commands that nuke untra
c
ked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
E
l
ijah Ne
w
re
n
Comment important codepa
t
hs r
e
garding
n
u
k
i
n
g untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
u
n
p
ack-tre
e
s: avoi
d
nuking unt
r
acked dir in way of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
u
n
pack-
t
rees: avoid
nuki
n
g
unt
r
acked dir in way
o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah N
e
wren
Change unpack_trees
'
'
r
eset' f
l
ag into an e
n
um
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elij
a
h N
e
wren
R
e
move ignor
e
d f
i
les
b
y default w
h
en the
y
a
re in the way
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elija
h
Newren
un
p
a
c
k-tre
e
s: make dir an internal-on
l
y stru
c
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
unpack-tr
e
es: in
t
roduce pre
s
er
v
e_ignored t
o
u
npac
k
_tre
e
s_options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
El
i
jah Newren
read-tree
,
merge-recursive: o
v
erwr
i
te ign
o
red
files
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elij
a
h
Newre
n
c
heckout,
read-tree: fix leak of unpack_trees_options
.
d
i
r
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-24
Elijah
Ne
w
ren
t2500: add various te
s
t
s
f
or nuking untracke
d
files
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-20
E
l
ijah Newren
merge
-
or
t
:
fi
x
com
p
letely wrong comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-20
Elija
h
Newren
tra
c
e2
.
h: fix trivial comment typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-12
Elijah Ne
w
ren
tes
t
s: r
e
move lefto
v
er untracked
f
iles
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Eli
j
ah Newren
am: f
i
x incorrect e
x
it
status
o
n a
m
fail to abo
r
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah
N
ewren
t4151: add
a few am
-
-a
b
o
rt tests
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah Newren
git-
a
m
.
txt: clar
i
fy -
-
abort behav
i
o
r
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
E
l
ij
a
h New
r
en
s
t
a
sh: re
s
t
o
re u
n
tracked file
s
A
F
TE
R
restoring
tracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
E
lijah Newren
st
a
sh:
a
void f
e
e
din
g
di
r
e
c
tories
to update
-
index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
El
i
jah Newren
t3903:
d
ocu
m
e
n
t a
p
a
ir
o
f
d
ire
c
tory/file bugs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elij
a
h N
e
wren
U
p
d
ate
docs
for change of default
merge backend
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah
Newren
C
hange
d
efau
l
t merge backend fr
o
m
r
e
c
ursive to ort
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
E
l
ijah
N
ewren
Update e
r
ror mess
a
ge
a
nd code c
o
mment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Eli
j
ah Newren
merge-
s
t
rate
g
ies
.
txt: add coverage of the `or
t
`
merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elija
h
N
ewren
g
i
t
-
rebase
.
txt: correct out
-
of-date
a
nd misleading
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
E
l
ijah Newren
merge-str
a
tegie
s
.
txt
:
fix simple capita
l
ization error
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elija
h
Newren
merge-strateg
i
es
.
txt: avoid giving special pre
f
erence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newre
n
me
r
ge-strategies
.
txt: do not imply
using copy de
t
e
c
tio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Ne
w
ren
merge-strategies
.
txt: update
wording for the resolve
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
E
l
i
j
ah
N
ewren
D
o
cum
e
n
tation: edit
a
w
kw
a
rd references to `g
i
t
merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
director
y
-renam
e
-detectio
n
.
txt: sm
a
l
l
updates
d
ue to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Ne
w
ren
git-rebase
.
txt: correc
t
antiqua
t
e
d
claims about --
r
ebase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-03
E
l
ij
a
h Newren
mer
g
e-o
r
t: remo
v
e compile-
t
ime a
b
ility to
tu
r
n
off
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Eli
j
ah Newren
merge-ort
:
reu
s
e path
s
trings in p
o
ol_alloc_filespec
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elija
h
Newren
merge-
o
rt: store filepairs and files
p
ecs in our mem
_
pool
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Ne
w
ren
d
i
f
f
co
r
e-rename, merge-
o
rt: add wra
p
p
er f
u
nctions
f
or
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newren
merge-ort: switch our
strmaps over to using memor
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah
N
e
wren
merge-
o
rt:
s
et
u
p a m
e
mory
p
ool
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newre
n
merge-ort: add pool
_
alloc, pool_cal
l
oc,
a
nd p
o
ol_strn
d
u
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elija
h
N
ewre
n
diffcore-re
n
a
me: use a mem_p
o
ol for exact rename det
e
ctio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newren
me
r
ge-ort:
r
ename str{map
,
intma
p
,
s
e
t
}_func()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
Elijah Newren
pu
l
l:
f
ix handlin
g
of mu
l
t
ip
l
e h
e
a
d
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
Elijah
N
e
wren
pull: update do
c
s & code for option
c
ompatibility wit
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
Elijah
Newre
n
pull:
a
bort by default
w
hen fast-forw
a
rding i
s
not
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
E
l
i
jah N
e
wren
p
ull
:
make --rebase and
-
-no-reb
a
se over
r
id
e
p
ull
.
ff
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-22
Elijah Newren
pull: si
n
ce
-
-
ff-
o
n
ly overrides, han
d
le it
f
irst
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-21
Elijah New
r
e
n
t7601: add tests o
f
intera
c
t
i
ons with m
u
ltip
l
e merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-21
Elijah Ne
w
r
e
n
t7601: tes
t
interactio
n
of
m
erge/re
b
ase/fast-f
o
rwa
r
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Ne
w
ren
merge-o
r
t: rest
a
r
t
merge with cache
d
rename
s
t
o reduce
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newr
e
n
me
r
g
e
-
o
r
t:
avoid recursi
n
g into directo
r
i
e
s when we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elija
h
N
ewr
e
n
mer
g
e-ort: defer r
e
cursing
i
n
to direct
o
ries whe
n
merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Ne
w
ren
merg
e
-ort: add a handle_de
f
erred_entri
e
s() helper f
u
nction
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
El
i
jah Newr
e
n
merge-ort: add data structures for
a
llo
w
able
trivi
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elijah Newren
merge-o
r
t: add some
m
or
e
expla
n
a
t
i
ons in colle
c
t_merge_info_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-20
Elij
a
h
N
ewren
merge-ort:
r
eso
l
v
e paths
e
a
r
ly when w
e
h
a
ve sufficient
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
E
lijah Newren
re
n
am
e
: bump limit
d
efaults
y
et again
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
Eli
j
a
h
N
e
w
ren
diffcore-rename: treat
a
rename_li
m
it
of
0
a
s
unl
i
mited
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
El
i
j
ah New
r
en
doc: clarify
d
ocume
n
tat
i
o
n
for r
e
name/copy lim
i
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-15
El
i
jah Newren
diff:
c
orrect warning message when renameLimit
e
xceeded
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-30
Elijah Newren
m
erg
e
-recur
s
i
v
e: han
d
l
e rename-to-s
e
lf c
a
se
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-30
Elijah
Newren
merge-
o
rt: ensure we
c
o
n
sult df_co
n
flict and p
a
th_conf
l
i
cts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-30
Elijah Ne
w
r
en
t
6
423:
test directory re
n
ames c
a
u
sing rename
-
to-self
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
Elijah New
r
e
n
merge-o
r
t:
add pr
e
fetc
h
ing for content merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
E
l
i
jah New
r
e
n
dif
f
c
ore-rename: use
a
d
if
f
erent
p
re
f
etc
h
fo
r
basename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
Elijah
N
e
wren
diffco
r
e-
r
e
na
m
e: allow different
m
i
s
s
i
ng
_
objec
t
_cb
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-28
Elijah Newren
t64
2
1: add
t
e
s
ts checkin
g
f
o
r excessive obje
c
t downloads
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-16
Elijah Newren
promisor-remo
t
e: ou
t
put tra
c
e
2
statistics for numb
e
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
Elijah Newren
m
erge-ort:
m
isc
e
llaneous t
o
uch-up
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
Elijah Newren
Fix various issue
s
found in comm
e
nts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
E
lijah Newren
diffcore-rename: avoid unn
e
cessary strdup'in
g
in break_idx
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-06-09
Elijah Ne
w
ren
me
r
ge-ort
:
repl
a
ce
string_list_
d
f_name_c
o
mp
a
re with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-27
Elijah N
e
wre
n
dir:
introdu
c
e readd
i
r_
s
kip_dot_and_dotdot()
h
e
lper
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
Eli
j
ah Newren
merge-or
t
, diffcore-rename: empl
o
y cached re
n
ames wh
e
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-05-20
E
l
ijah New
r
en
m
e
r
g
e-or
t
: handle interactions of c
a
c
h
ing and re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next