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
fast-rebase: demonstrate merge-ort's API via new test-tool command
2020-10-29
Elijah Newren
fast-rebase: demon
s
tr
a
te mer
g
e-o
r
t
'
s AP
I
v
i
a new
t
est
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-27
Elijah Newre
n
me
r
ge-or
t
-wrappers: new convienc
e
w
rappers
t
o mimic
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-10-27
Elijah
N
ewren
merge-o
r
t: bare
b
o
n
es API of n
e
w merge str
a
tegy with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-19
El
i
jah Newren
dir: fix p
r
oblematic API to avoid memory lea
k
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-19
E
lijah
N
e
wren
dir: make cle
a
r_
d
irec
t
ory(
)
free all rel
e
vant memory
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-18
Elija
h
Ne
w
r
e
n
mem-pool:
u
s
e
c
onsi
s
tent poo
l
var
i
ab
l
e name
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-18
Elijah
N
ew
r
en
m
e
m
-pool: use more standard initia
l
iz
a
ti
o
n
and fin
a
l
i
z
a
tion
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-18
Elijah Newre
n
m
e
m-
p
ool: a
d
d
c
onvenience functions fo
r
strd
u
p a
n
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-14
Elijah Ne
w
ren
sequence
r
: avo
i
d garbled merge machiner
y
messages due
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-12
E
l
ijah Newren
di
r
: a
v
oid prem
a
turely marki
n
g nonbare repo
s
itories
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-12
El
i
j
ah Newren
t3000: fix some test d
e
scriptio
n
t
ypos
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
E
lijah
N
e
w
r
en
t642
5
: b
e
mor
e
flexible with re
n
ame/delete
c
onflict
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
E
l
ijah New
r
en
t642[23]: be more flexible for
a
dd/ad
d
c
onflicts involving
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elijah Newren
t6422, t6426:
be more flexib
l
e for add/add confl
i
cts
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elijah Newren
t6423: add an explanation about
why one of the
t
e
sts
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
El
i
jah Newren
t6416,
t6423: clarify some comments a
n
d
f
i
x some typos
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elija
h
Newren
t6422:
fix
mu
l
tiple e
r
rors with
the mod6 test expectations
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elijah Newren
t6423: fix
test setu
p
for a co
u
ple tests
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
E
lijah Newren
t641
6
, t6422: fix incorrec
t
untracked
file cou
n
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elija
h
New
r
en
t6422: fix
b
ad c
h
eck against mis
s
i
n
g
f
i
le
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
E
l
ijah Newren
t641
8
: tighten
d
elete/normalize conflict
t
e
s
t
c
as
e
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-10
Elijah Newren
Collect mer
g
e-rel
a
te
d
t
ests to t6
4
xx
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-03
E
l
ija
h
N
ewren
che
c
k
o
ut
:
s
upport
renormalization wit
h
checkout -m
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-03
El
i
jah New
r
en
merge
:
ma
k
e merge
.
r
enorma
l
i
ze work for all u
s
es
of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-03
El
i
jah Newren
t6
0
3
8
: remove
pr
o
blemati
c
test
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-03
Elijah Newr
e
n
t6
0
38: make
tests fa
i
l for the ri
g
ht reason
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-08-02
Elij
a
h Newr
e
n
m
e
rge-r
e
cursi
v
e
: fix unclear
a
nd outright wron
g
comment
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-07-28
Elijah Newren
hashmap:
fix typo in
usage docs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-07-28
Elija
h
Newren
Remove
doubled wor
d
s i
n
various
c
omments
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-22
Elijah N
e
wren
git-prom
p
t: includ
e
sparsity state as
well
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-22
E
l
ijah N
e
wren
gi
t
-
p
ro
m
pt: do
c
umen
t
how in-progr
e
ss o
p
erations a
f
f
e
ct
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-18
Elijah N
e
wren
wt
-
status: show sparse
checkout stat
u
s as
w
e
ll
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-13
El
i
jah Newr
e
n
clean: o
p
timize and docu
m
ent case
s
where we recurse
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-13
E
lijah Newren
c
l
ean:
consol
i
da
t
e h
a
n
dling o
f
i
g
n
ore
d
parameters
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-13
Elij
a
h Newren
dir, clean: avoid disa
l
lowed b
e
ha
v
i
or
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-13
Elijah Newren
d
i
r
:
fix a f
e
w confus
i
ng comments
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-13
El
i
jah
N
ewren
git-sparse-che
c
ko
u
t:
c
larif
y
interactions with submodu
l
e
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-05
El
i
ja
h
Newren
d
ir: f
i
x t
r
eatment
o
f negated pathspec
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-06-05
El
i
j
ah Newren
sp
a
rse-checkout: avoid
s
t
aging
deletions
o
f
a
ll files
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-05-31
Elij
a
h Newre
n
f
a
s
t
-import: add new --
d
ate
-
format=raw-permissive for
m
at
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-05-15
Elija
h
Ne
w
ren
unpack-trees: als
o
a
llo
w
get_p
r
ogress()
t
o work on
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-05-14
Elijah Newren
merge-recursive: fix r
e
n
a
me/rename(1to
2
) for working
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-27
Elij
a
h N
e
wren
rebase: display
an error if
-
-ro
o
t and
--fork-point
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-11
Elijah
Newren
r
ebase: fix an
inco
m
patible-opt
i
o
ns error messa
g
e
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-11
Elija
h
Newren
r
e
base:
reinsta
t
e --n
o
-keep
-
empty
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-11
Elij
a
h Newren
r
e
base -i: mark co
m
mits that beg
i
n e
m
pty in todo editor
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-07
Eli
j
a
h Ne
w
r
e
n
sequencer: hon
o
r GIT_REFLOG_A
C
TION
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-05
Elijah New
r
en
git
-
rebase
.
t
xt: a
d
d anot
h
er hook
t
o
the hooks sec
t
ion
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-01
El
i
jah
N
e
w
ren
completio
n
:
fix 'git add'
on paths under an unt
r
acked
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-01
Elijah Newren
Fix error-pr
o
ne fil
l
_direc
t
o
r
y() API; mak
e
it
only
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-01
Elijah Newren
dir: r
e
place dou
b
le pathspec m
a
tching wit
h
sing
l
e in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-01
E
lijah
N
ewren
dir: include DIR
_
KEEP_UN
T
R
A
CKED_CONTENTS handling in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-01
Eli
j
ah Newren
dir: r
e
p
l
ace
e
xponent
i
al algorithm 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 Ne
w
ren
dir: f
i
x co
n
fusion
b
ased
o
n va
r
i
a
b
l
e
t
ense
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-01
E
lijah N
e
w
r
en
dir:
fi
x
broken
c
omm
e
nt
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-01
Elija
h
Newren
dir: consolidate treat_path() and treat_
o
ne_pa
t
h
(
)
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-01
Elijah
N
ewren
dir: fix sim
p
l
e typo in comment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-01
Elijah Newren
t3000:
ad
d
more testcases testing a vari
e
t
y of ls-files
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-04-01
Eli
j
ah Newren
t7063: more thorough stat
u
s
c
heckin
g
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah New
r
en
pull: av
o
i
d runni
n
g
bo
t
h merge and rebase
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Ne
w
ren
sp
a
rse-checkout: pro
v
i
d
e a new
r
eapply subcomm
a
nd
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
unpac
k
-trees: fai
l
ure to
s
et S
K
IP
_
WORKTREE bits alwa
y
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah
N
e
w
r
en
unp
a
ck-tre
e
s:
provide
w
arnings on sparse upda
t
es
f
or
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
E
lij
a
h Newren
unpack-trees: ma
k
e spar
s
e path messages so
u
nd like
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Ne
w
ren
unp
a
c
k-trees: split d
i
splay_error_msgs
(
) into
t
wo
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
unpack-trees: rename
E
RROR_*
fiel
d
s meant for warn
i
ngs
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah
Ne
w
ren
unpac
k
-trees:
m
ove ERROR_WOULD_LOSE_SUBMODULE earlier
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
sparse-
c
h
eckout: u
s
e improved unpac
k
_
trees porcelain
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Ne
w
ren
s
p
arse-checkout
:
use
n
ew
u
pdate_sparsit
y
() function
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
E
l
i
j
ah
Newren
unpack-tre
e
s
:
a
dd a new upda
t
e_sparsity() function
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
u
np
a
ck-trees: pu
l
l sparse-ch
e
c
kout pattern reading
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Ne
w
ren
u
n
pa
c
k-t
r
e
es: do not mark a dirty p
a
th with SKIP_WORKTREE
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elija
h
Newren
u
npac
k
-
t
r
ees:
al
l
ow check_updates
(
)
t
o work on a different
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
E
lijah Newr
e
n
t
1
0
91: m
a
ke some t
e
sts a litt
l
e more
d
efensive against
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
unpack-trees: si
m
plify patt
e
rn_l
i
st fr
e
eing
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah New
r
e
n
u
npack-trees: sim
p
lif
y
verify_absent_
s
par
s
e()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
unpack-trees: remove unu
s
ed error
t
ype
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-27
Elijah Newren
un
p
ack-tre
e
s:
f
i
x mino
r
t
ypo in comment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-18
Elijah Newren
RelNotes/
2
.
2
6
.
0: fix various typos
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-15
Elijah Newr
e
n
oids
e
t: remove unnecessary inc
l
ude
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-13
Eli
j
ah Newre
n
t6022, t6
0
46: fix flak
y
files-are-update
d
check
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-11
Elijah Newren
g
i
t-rebase
.
t
x
t
:
h
ighlight backe
n
d differences with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-03-11
Elijah Newren
seq
u
encer:
clear state up
o
n dropping
a
become-
e
m
pty
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-27
El
i
jah Newren
t6020:
ne
w
tes
t
with i
n
terleaved lexicographic orderin
g
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-27
Elijah Newren
t
6022
,
t
6046: test expected behavior instead of testin
g
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-27
Elijah Newren
t3035:
prefe
r
te
s
t_must_fail
to bash ne
g
ation for git
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-27
Elijah
N
e
wren
t6020,
t6022
,
t
6035: update merge tests to
use test
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-27
Elijah
Newren
t602[1236], t6034:
m
oder
n
i
z
e test f
o
rma
t
ti
n
g
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-27
Elijah Newren
m
erge-recu
r
sive
:
ap
p
ly col
l
ision handling
u
nification
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-19
E
l
ijah Newren
merge-
r
e
cursive: fix the
r
efresh logic i
n
u
pdat
e
_file_flags
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-19
Elijah Newren
t
3
433: new rebas
e
testcase d
o
cumenti
n
g a stat-dirty
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-18
E
l
i
jah Newren
check-ig
n
ore
:
f
i
x
d
ocu
m
ent
a
tion and implem
e
nta
t
i
on
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
El
i
jah Newren
rebase: rename the two p
r
imary rebase ba
c
ken
d
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
E
lijah Newren
reb
a
se: change the defa
u
l
t
b
ackend from "a
m
" to "me
r
ge
"
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newre
n
rebas
e
: make the backend
configurable via con
f
ig settin
g
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Eli
j
ah Newren
rebase
t
es
t
s: repeat some tests using th
e
merge
b
ackend
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
rebase tes
t
s: mark test
s
specific to
t
he am
-
ba
c
k
end
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
rebase: drop '-i' from the
r
eflog for interactive-based
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
git-prompt:
change the prom
p
t
f
or int
e
ra
c
t
i
ve-based
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
reb
a
se: add an --am
option
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next