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-ort-wrappers: new convience wrappers to mimic the old merge API
2020-10-27
E
l
ij
a
h New
r
en
m
e
rg
e
-
o
rt-wrapper
s
:
new convien
c
e wrappe
r
s
t
o mimic
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-27
Elijah Newr
e
n
merge-ort: bare
b
ones AP
I
of n
e
w merg
e
strategy with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-19
E
lijah Ne
w
r
e
n
dir: fix pr
o
blematic API to avoid memory leaks
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-19
Elij
a
h
N
ewren
dir: mak
e
clear_directo
r
y() free all
rel
e
vant memory
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-18
Elijah Newre
n
mem-p
o
ol: use co
n
sistent p
o
ol variable na
m
e
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-18
Elijah Newren
mem-pool:
u
se more standard i
n
itializa
t
ion an
d
final
i
zation
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-18
Elijah
Newren
mem-poo
l
: add conveni
e
nce functions for strdup a
n
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-14
Elija
h
Ne
w
r
en
sequencer: avoid garbled me
r
ge machinery messages due
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-12
Eli
j
ah Newren
dir: avoid prematurely ma
r
k
ing non
b
are repositories
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-12
Eli
j
a
h Ne
w
ren
t3000: fix
s
o
m
e
t
est d
e
scription
typos
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elija
h
Newr
e
n
t
64
2
5: be more flexible wi
t
h rename/del
e
te conflict
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elijah Newren
t
6
42[23]: be more flex
i
ble for
ad
d
/
a
dd conflicts inv
o
lving
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elija
h
N
e
wre
n
t
6
422,
t
6
426: be more flexible for add/add
conf
l
icts
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elij
a
h N
e
wren
t6423: add an e
x
p
l
an
a
tion ab
o
ut w
h
y one
of the tes
t
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Eli
j
ah Newren
t
6
4
16, t6
4
2
3
: clarify some
comm
e
nts
and
f
ix some t
y
pos
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elijah N
e
wren
t
6422: fi
x
m
u
lt
i
ple errors
with the
m
od6 t
e
st expect
a
tions
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Eli
j
ah Newren
t6423: fix t
e
st se
t
u
p
for a c
o
uple tests
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elij
a
h
N
e
wren
t6416,
t
6
422: fix i
n
c
o
rrect
untracked
f
ile c
o
unt
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elijah Newren
t6422: f
i
x
ba
d
c
h
e
ck
a
gainst missing file
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elijah Newren
t
6
418: t
i
ghten de
l
ete/normal
i
ze conflict
testcase
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elijah Newr
e
n
Collect merge-r
e
lated t
e
sts t
o
t64xx
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-03
E
lijah N
e
wr
e
n
che
c
kout: support r
e
normali
z
at
i
on with checkout -m
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-03
Elijah N
e
wren
merge: m
a
k
e
merge
.
renormalize work f
o
r
al
l
uses
of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-03
Elijah Newren
t6038: remov
e
prob
l
e
m
atic test
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-03
El
i
jah Newren
t6038:
m
ake tests fail for the ri
g
ht reason
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-02
Elijah New
r
e
n
m
e
rge-rec
u
rs
i
ve: fix uncle
a
r and outright wrong comments
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-07-28
Elijah Ne
w
re
n
hashmap: fix
t
ypo in usage docs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-07-28
Elijah New
r
en
Rem
o
ve double
d
words in various comments
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-22
El
i
jah Ne
w
ren
git-
p
ro
m
pt: i
n
clude
spar
s
ity state as well
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-22
Elijah Newren
git-pr
o
mpt: docu
m
e
nt how i
n
-progress
operatio
n
s affect
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-18
Elijah New
r
en
wt-sta
t
us: s
h
o
w sparse checkout st
a
t
us as well
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-13
Eli
j
ah Newren
clean
:
optimize
and documen
t
cases wher
e
we recur
s
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-13
Elijah Newren
c
l
ean: consolidate h
a
ndl
i
ng
o
f ignored parame
t
ers
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-13
Elija
h
Newren
di
r
, clean: av
o
id disal
l
o
w
ed beha
v
ior
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-13
E
lijah Newren
d
i
r
: fix a few confusing comm
e
nts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-13
Elij
a
h
N
ewren
g
it-sparse-chec
k
out
:
clarify interactions with
s
ubmodu
l
es
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-05
Elijah
Newren
d
ir: fi
x
treatment of negated pathsp
e
cs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-05
Elijah New
r
en
s
p
arse-
c
heckout: avoi
d
stag
i
ng deletions of all files
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-05-31
Elija
h
Newren
f
ast-import: add
new --date-form
a
t=raw-permissive format
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-05-15
Elijah
N
ewren
unpack-t
r
ees: al
s
o allow
get_progr
e
ss() to
w
ork
on
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-05-14
Elijah
N
ewren
merg
e
-recursive: fix
r
enam
e
/
ren
a
me(1t
o
2) for working
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-27
Elijah Newren
rebase: display an error if --ro
o
t a
n
d --fork-point
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-11
Elijah Newren
r
ebase: fi
x
an inco
m
patible-opt
i
o
n
s error me
s
sage
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-11
Elijah Newren
rebase: reinstate -
-
no
-
keep-empty
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-11
E
l
i
jah
Newren
rebase -i
:
mark comm
i
ts that
begin e
m
pty in todo e
d
itor
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-07
Elijah Newren
sequen
c
er: ho
n
or GIT_RE
F
LOG_ACTION
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-05
E
l
ijah Newr
e
n
git
-
r
eba
s
e
.
t
x
t
: add another hook to the
h
ooks section
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-01
E
l
ijah Newren
completion
:
fix
'git add'
on paths under an untracked
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-01
Elijah N
e
wren
Fix error-pron
e
fil
l
_dire
c
t
o
ry() API;
m
ake it
o
nl
y
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-01
Elijah Newr
e
n
dir: replace doub
l
e
p
athspec mat
c
hing wi
t
h single in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-01
E
lijah Newren
dir: include DIR_KEEP
_
UNTRACKED_CONT
E
NTS handling in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-01
Elijah Newre
n
dir:
r
eplac
e
exponential algo
r
ithm with a linear one
...org/git/20190905154735.29784-1-
newren@gmail.com
/
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-01
Elijah Newr
e
n
dir: fix conf
u
sion b
a
sed o
n
variable t
e
n
se
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-01
Elijah
Newren
dir: fix bro
k
en c
o
m
m
e
n
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-01
E
l
i
jah Newr
e
n
d
i
r: consolidate treat_p
a
th() and treat_one_path()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-01
Elijah
N
ewren
dir: f
i
x si
m
ple typo
in co
m
ment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-01
Elijah Newr
e
n
t30
0
0
:
add more testcases testing a varie
t
y
o
f ls-
f
i
l
e
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-01
E
l
ij
a
h Newren
t
7
0
6
3: mor
e
t
h
oro
u
gh
status chec
k
ing
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
E
l
ijah
N
e
wren
pull: a
v
oid running both merge and re
b
ase
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Eli
j
ah New
r
en
sparse-checko
u
t: provide a new r
e
a
pply
s
ubco
m
ma
n
d
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elij
a
h Newren
u
n
p
a
ck-t
r
ees:
f
ailure to set SKIP_WORKTR
E
E bits always
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
unpack-trees: provide
wa
r
nin
g
s
on sparse updates for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
E
l
ijah
N
ewr
e
n
unpa
c
k
-t
r
ees
:
make sp
a
rse path
m
essages s
o
und l
i
k
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
unpa
c
k-trees:
s
plit
d
i
s
play_error_m
s
gs() into two
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
u
npack-tr
e
es: rename ERROR_* fields meant for warnings
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
unpack-trees: move ER
R
OR_WOUL
D
_L
O
SE_SUBMODULE
e
arlier
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Ne
w
ren
sparse-checkout: use improv
e
d
u
n
pack_trees porce
l
ain
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newr
e
n
sparse-checkout: use
n
ew update
_
sparsity() function
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
E
l
ijah Newr
e
n
unpack-
t
rees:
a
dd a n
e
w update_spars
i
t
y
(
)
f
u
nction
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah New
r
en
u
n
pa
c
k-
t
rees: p
u
ll s
p
arse-checkout pattern reading
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Eli
j
ah Newren
unpack-trees
:
do
n
ot mark
a
d
irty path with
SKI
P
_WORKTREE
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Eli
j
a
h
N
ewren
u
n
pack-trees: allow chec
k
_updates
(
) t
o
work
o
n a
different
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah N
e
wren
t1091
:
m
a
ke some tes
t
s
a
lit
t
le more defensive
a
g
a
ins
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
u
npa
c
k
-
t
r
e
e
s: simplify patt
e
rn_
l
ist freeing
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Eli
j
a
h Newre
n
u
npack-trees: sim
p
lify verify_a
b
s
ent
_
s
p
a
rse()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Eli
j
ah New
r
en
u
npack-tree
s
: remove unused error typ
e
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
unpack-t
r
e
e
s
:
fix minor t
y
po in
co
m
ment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-18
Elijah Newren
Rel
N
otes/2
.
2
6
.
0: f
i
x various typos
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-15
E
lij
a
h
N
ewren
oidset: remove unn
e
cessary
i
n
cl
u
de
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-13
El
i
jah Newren
t6022, t6046: fix flaky files-are-updated checks
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-11
Elijah Newren
git-rebase
.
txt: hig
h
ligh
t
back
e
n
d
dif
f
erences wit
h
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-11
Elijah Newren
sequenc
e
r: cle
a
r s
t
ate up
o
n
dr
o
pping a b
e
come-empty
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-27
E
l
i
j
ah
N
ewr
e
n
t60
2
0
:
n
e
w test with interle
a
ved lexi
c
ographic order
i
ng
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-27
El
i
jah N
e
wren
t6022, t6046: test expected behavior instead of
testin
g
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-27
E
lijah
New
r
en
t3035: prefer test_mu
s
t_fail to b
a
sh negation for git
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-27
Elijah
N
ewren
t6020,
t
6
0
22,
t
6035: update m
e
rge
t
ests to
u
se test
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-27
E
lijah Newren
t602
[
1
236], t6
0
34: moder
n
ize test
f
orm
a
t
tin
g
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-27
Elijah
N
e
wren
merge-recursive
:
apply collision han
d
ling un
i
f
i
cation
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-19
Elijah Ne
w
ren
merge
-
recursive
:
fix th
e
r
efresh logic in u
p
date_file_fl
a
gs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-19
Elijah Newren
t343
3
: n
e
w rebase tes
t
c
a
s
e docum
e
nting a stat-dirty
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-18
Elijah New
r
en
check-ignore
:
fix document
a
tion and implementat
i
o
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
E
l
ija
h
Newren
rebase: rename the two primary rebase backend
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah
N
ewren
rebase: change the
default backend from "am" to "merge"
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elij
a
h New
r
en
re
b
ase: mak
e
th
e
ba
c
kend co
n
fi
g
urable
v
ia config setting
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Ne
w
ren
reb
a
se tes
t
s: repe
a
t some
t
es
t
s using t
h
e merge backe
n
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah
N
ewren
rebase tests: mar
k
tests specif
i
c to the a
m
-b
a
c
k
e
n
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
E
l
i
ja
h
Newre
n
reba
s
e: drop '-i
'
from t
h
e reflog for
i
nteract
i
v
e
-
b
ased
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
git-prompt: change t
h
e prompt for in
t
er
a
ct
i
ve-ba
s
ed
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elija
h
Newren
r
e
bas
e
:
ad
d
an --am option
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elij
a
h Newre
n
r
e
base:
move
incompatib
i
lity checks betwe
e
n
b
a
cken
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next