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
stash: make internal resets quiet and refresh index
2022-03-02
El
i
ja
h
N
e
wr
e
n
re
p
o_read_i
n
dex: ad
d
config
t
o ex
p
ect
fil
e
s out
s
ide
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah New
r
en
m
erge-or
t
: f
i
x small
m
e
m
ory
leak in u
n
ique_path()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newren
mer
g
e-ort: fix small memory
l
eak in d
e
tect_an
d
_pro
c
ess_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newren
sparse-checkout: reject
a
rguments in
c
one-mode that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah
N
ewren
sparse-
c
h
e
ckout: e
r
ro
r
or war
n
when giv
e
n
individual
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah
Newren
s
parse-checkout: pay
attent
i
on to
pr
e
f
ix
for {set,
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah
Newren
sparse-checkout: correctly set n
o
n
-c
o
ne mode when expected
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newren
s
p
ar
s
e
-checko
u
t: correct reapply's handling of
o
p
tions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-17
Elijah Newren
mer
g
e-ort:
make
i
n
f
ormation
a
l messages f
r
om
recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
E
lijah Ne
w
ren
diff-mer
g
es:
avoid
h
i
s
t
o
r
y
simplifications
when di
f
fing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah
N
ew
r
e
n
merge-ort: mark c
o
nflict/warnin
g
messages from inn
e
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
E
lija
h
N
ewren
sho
w
, l
o
g:
i
nclude con
f
lict/w
a
r
ning messages in --reme
r
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah New
r
en
diff:
a
dd ability to insert ad
d
itional headers for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newr
e
n
mer
g
e-ort: fo
r
mat message
s
s
light
l
y
different for u
s
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elij
a
h Newren
m
e
rge
-
o
r
t: mark a f
e
w more confli
c
t messages as om
i
ttable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
El
i
jah Newren
mer
g
e-ort
:
c
a
pt
u
re and
p
r
i
nt ll-m
e
r
ge warnin
g
s in our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah N
e
wren
ll-merge: make cal
l
ers respons
i
ble for showing warnings
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
E
lija
h
Newren
log:
cle
a
n
unneeded objects during `log --remer
g
e-diff`
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newr
e
n
show,
log: pro
v
ide
a
--remerge-diff c
a
pability
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
E
lij
a
h New
r
en
re
p
o-settin
g
s
:
ren
a
m
e the tra
d
itional default fetch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
repo-s
e
ttings: fix error handling fo
r
unknown
val
u
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
E
l
ijah Newren
re
p
o
-
settings:
f
ix
checking for fetch
.
negotiati
o
nAlg
o
rithm
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-28
Elijah Newren
sparse-checkout: fix a coupl
e
m
inor me
m
ory
l
eaks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-26
Elijah Ne
w
ren
seq
u
e
ncer
,
sta
s
h: fix running
from
w
ork
t
r
e
e
subdir
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-21
E
lijah
Newren
mer
g
e
:
fix m
e
mory leaks
in cmd_m
e
r
g
e
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-21
Elija
h
Newren
merge
-
ort: fix memory leak in merge_ort_int
e
rna
l
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-17
Elijah Newren
me
r
ge-ort: avoid assum
i
n
g all renames d
e
tected
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
E
lijah Newren
A
c
celerate clear_skip_worktree_f
r
om_present_files(
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newren
U
p
date
d
ocumentatio
n
related t
o
spar
s
i
t
y and th
e
skip
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
El
i
jah
N
ewren
repo_read_index:
c
lear
SKIP_WOR
K
TREE b
i
t
f
r
om
f
iles
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elijah
N
ewr
e
n
unpack-tre
e
s
:
f
i
x ac
c
idental
loss
o
f use
r
ch
a
ng
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
E
l
ijah Newren
t1011: add testcase demonstrating accidental loss of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-04
Elijah N
e
wr
e
n
stash: do not return before re
s
toring untracked f
i
les
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-30
Elij
a
h Newren
merge-ort: fix
b
u
g
w
ith renormaliz
a
t
ion and ren
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-23
Elijah N
e
wren
spars
e
-
c
heckout: remove stray trailing space
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elij
a
h
Newren
clone:
a
void usin
g
de
p
recated `sp
a
rse-checkout init`
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah N
e
wren
Doc
u
m
e
nta
t
ion: c
l
arify/co
r
rect a few sparsity r
e
lated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
E
lijah Newren
git-sparse-c
h
eckout
.
txt:
update to document init/set
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
sp
a
r
s
e-check
o
u
t: enabl
e
reapply t
o
take --[no-]{cone
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
E
lijah
N
ewren
s
p
arse
-
c
heckout: en
a
ble `set` to in
i
tializ
e
sparse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
E
lijah Ne
w
ren
spar
s
e-checkout: spl
i
t out code for tw
e
ak
i
n
g
settings
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
sparse-checkout:
d
isallow --no-
s
td
i
n
as an argument
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
spar
s
e-checkout: add sanit
y
-checks on initial
s
parsity
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
El
i
j
a
h N
e
wren
sparse-checkout: brea
k
apart function
s
for sparse
_
checkout_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
E
l
ijah Newr
e
n
sparse-checko
u
t
: pass use_stdin
as a parameter inste
a
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elija
h
New
r
en
t250
1
: simpl
i
f
y the tests s
i
nce we can now assu
m
e desir
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newr
e
n
dir: ne
w
flag to remove_di
r
_recurse(
)
to sp
a
re the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
dir: avoid incidental
l
y r
e
mo
v
i
ng the origina
l
_cwd
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
l
ijah Newr
e
n
s
t
a
sh:
do not a
t
te
m
pt
t
o
remove star
t
up_info->orig
i
nal_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
rebase: d
o
not atte
m
pt to rem
o
ve startup_i
n
fo->
o
rigi
n
al_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
N
ewren
clean:
d
o
n
ot att
e
mpt to remove startup_in
f
o
->or
i
ginal
_
cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elija
h
New
r
en
symlinks:
d
o not inc
l
ude startu
p
_info->original_cwd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
lijah Newren
unpa
c
k
-t
r
ees: add speci
a
l cwd ha
n
dling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
unpa
c
k-trees: refuse to re
m
ove startup_
i
n
fo->origina
l
_
cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newre
n
set
u
p
:
introdu
c
e
startup_info
-
>original_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
l
ijah Newren
t
2
50
1
: add variou
s
tes
t
s f
o
r r
e
moving the current wo
r
king
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-05
El
i
jah New
r
en
s
e
quen
c
er: do not
expo
r
t
G
IT_DIR and
G
IT_WO
R
K_TREE
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-05
Elija
h
Newren
name-rev: prefer shorte
r
names ov
e
r foll
o
wi
n
g
m
e
rges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-01
Elijah Newren
update documentation for
n
e
w
z
diff3 co
n
flictStyle
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-11-30
Elijah New
r
en
sequenc
e
r:
a
void adding
e
xec
c
ommands for non-commit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elij
a
h Newren
Documentati
o
n: call out c
o
mmands tha
t
nuke untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah N
e
wren
Comment
i
mport
a
nt codepaths regarding n
u
king untrack
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah
N
ewren
unpac
k
-
tre
e
s: avoid nuking
u
ntracked dir
i
n way of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah
New
r
en
u
npack-
t
rees: av
o
id nuking untracked dir in wa
y
o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
C
h
ange u
n
p
a
ck_trees' 'reset' fl
a
g into an
enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
Remove ignored fi
l
es by default
w
h
e
n
they are in the way
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elij
a
h
N
ewre
n
unpack-tr
e
es: make dir an inter
n
al-only struc
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
unpack-
t
r
e
es: introduce preserve_ignored to unp
a
ck_tr
e
es_optio
n
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
E
lijah Newren
read
-
tree, merge-
r
ecursive:
overwrite i
g
nored
f
i
le
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
chec
k
out, read
-
tree: fix leak
o
f unpac
k
_t
r
ees_options
.
dir
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-24
E
l
ijah
Newren
t2
5
00: add
various tests for nuk
i
ng untracked files
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-20
Elijah Newren
merge
-
o
r
t: fix completel
y
wro
n
g
c
om
m
ent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-20
E
l
ijah Newren
trace2
.
h
:
fix trivial comment typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-12
Elijah
N
ewren
t
e
s
ts: r
e
move l
e
fto
v
er untr
a
cked files
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Eli
j
ah Newren
am: fix in
c
orre
c
t exit status on a
m
fail to ab
o
rt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah New
r
en
t4151: add a few am --
a
bor
t
test
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Eli
j
ah Ne
w
ren
git-am
.
txt: clarify --a
b
or
t
behavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah Newren
stash
:
restor
e
unt
r
a
cked f
i
l
e
s AFTE
R
restoring tracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah Newren
stash: avoid f
e
ed
i
ng directories to update-index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
E
lijah New
r
e
n
t3
9
03: document a pair o
f
di
r
ec
t
o
ry/f
i
le
b
ugs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
Update do
c
s
for chang
e
of defaul
t
merge backend
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah N
e
wren
C
h
a
n
ge default merge
backend from re
c
u
r
sive
t
o
ort
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah New
r
en
Update error message a
n
d code
c
o
m
ment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah New
r
e
n
merge
-
s
t
rat
e
gies
.
txt: add coverage of th
e
`or
t
` mer
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
git-rebase
.
txt:
c
o
r
rect out-
o
f-date and misl
e
ading
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newren
m
e
rge-strategi
e
s
.
txt: fix sim
p
le capitalization
e
rror
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah
Newre
n
mer
g
e-strategies
.
txt: avoid giving sp
e
cial preferenc
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
El
i
jah Newren
mer
g
e-
s
trategies
.
txt: do
not im
p
ly using c
o
py dete
c
tion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
E
l
ijah N
e
wren
m
e
rge-st
r
ategies
.
txt: updat
e
wording for
t
h
e resolv
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
El
i
jah
Newr
e
n
D
ocumentation: edit awkward
references to `g
i
t merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah
New
r
e
n
direct
o
ry
-
rename-detectio
n
.
txt
:
sma
l
l update
s
due to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-05
Elijah Newre
n
git-re
b
ase
.
txt
:
cor
r
ect antiquated
clai
m
s a
b
out --rebase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-08-03
Elijah Ne
w
r
e
n
m
er
g
e-ort:
remove compi
l
e
-
time ability to t
u
rn off
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah
N
e
wren
merg
e
-or
t
: reuse path strings i
n
p
o
ol_
a
llo
c
_filespec
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Eli
j
ah Newr
e
n
merge
-
o
r
t: s
t
ore filepairs a
n
d fil
e
specs in our
m
em_poo
l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newr
e
n
diffcore-renam
e
,
m
erge-ort: add wrap
p
e
r
f
unctions fo
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Newren
merge-ort:
sw
i
tch our s
t
rmaps over to u
s
ing me
m
o
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
E
lij
a
h New
r
en
merge-ort:
se
t
up a memory poo
l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
El
i
jah
Newren
merge-o
r
t: add pool_
a
l
l
o
c
, po
o
l_calloc, a
n
d pool_
s
trndup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-07-30
Elijah Ne
w
ren
diffcore-
r
ename: u
s
e a mem_pool for exact rename de
t
ect
i
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next