repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Start the 2.46 cycle
2024-04-18
Phillip Wood
re
b
ase -m: fix --
s
i
g
noff with
con
f
l
i
c
t
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-04-18
Phil
l
ip W
o
od
sequenc
e
r:
store commi
t
message
i
n p
r
ivat
e
co
n
t
ex
t
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-04-18
Phillip Wood
sequencer: move current fixups to private contex
t
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-04-18
Philli
p
Woo
d
seq
u
encer
:
st
a
r
t
remov
i
ng
p
riv
a
te fields fr
o
m p
u
blic API
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-04-18
Phi
l
lip Wood
sequencer
:
always
fre
e
"struct repl
a
y
_
o
p
t
s"
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-04-09
Ph
i
llip Wood
t3428: restore coverag
e
fo
r
"ap
p
ly" back
e
nd
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-04-09
Philli
p
Wood
t3428:
use test_commit_
m
essage
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-04-09
Phillip Wood
t3428: modernize
t
e
st
s
etup
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-03-14
Phillip Wo
o
d
checkout: fix interaction be
t
ween --c
o
nflic
t
a
nd -
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-03-14
Phillip W
o
od
c
heckout: cleanup --
c
onflict=<style> p
a
rsi
n
g
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-03-14
Phi
l
lip
W
ood
merge options: add a confl
i
ct
style member
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-03-14
Phi
l
lip Wood
m
erge-ll:
i
nt
r
oduce LL
_
MERGE_OPTIONS_INIT
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-03-14
P
hillip Wo
o
d
x
d
iff
-
i
nter
f
ace:
r
efa
c
t
o
r
parsing of merge
.
confl
i
ctstyl
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-02-27
Phillip W
o
od
re
b
ase -i: stop setti
n
g GIT_CHERRY_PICK_HELP
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-02-09
Phillip Wood
prune:
mark rebas
e
autosta
s
h a
n
d orig-head as reachable
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-02-07
Phillip
W
ood
t
1400: use s
h
o
w
-
r
ef to check pseudorefs
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-02-07
Phillip Wood
sh
o
w-ref --v
e
rify:
a
c
ce
p
t ps
e
udorefs
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-11-09
Phillip W
o
od
unit te
s
ts: add TAP unit
test f
r
a
m
e
wo
r
k
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-09-06
P
hi
l
l
ip Wood
rebase -
i
: fix
a
d
ding fa
i
led command
to the to
d
o lis
t
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-09-06
Phillip Wood
rebase --
c
ontinue: refu
s
e
to co
m
mit aft
e
r failed command
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-09-06
Phillip Wood
rebase: fix
r
e
written list for failed
p
ick
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-09-06
Phil
l
ip W
o
od
sequ
e
n
c
er: factor
out part of pic
k
_
commits
(
)
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-09-06
P
h
illip Wood
se
q
uenc
e
r: use rebase
_
p
ath_me
s
sage()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-09-06
Phillip
W
ood
r
e
b
ase -i
:
remove
p
atch
f
ile after conflict r
e
s
o
lutio
n
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-09-06
Phillip Wood
reba
s
e -i:
move unlink() calls
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-08-10
Philli
p
Wood
t
4
0
5
3
: av
o
id
ra
c
e when k
i
l
ling b
a
ck
g
round processes
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-08-03
P
h
illip Wood
rebase
-
-skip: f
i
x commit m
e
ssage clean up when s
k
ipping
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-07-05
P
hillip Wood
diff
-
-no-index: su
p
p
o
rt rea
d
i
n
g
from na
m
ed p
i
pes
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-07-05
P
hillip Wood
t4054: test
diff
--no-index with stdin
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-07-05
Phillip Wood
diff --no-in
d
ex: die
on error reading stdin
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-07-05
Ph
i
llip
W
ood
diff --no-index
:
refuse t
o
compare st
d
i
n to a direct
o
ry
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-06-26
Phillip
Wood
apply: improv
e
error me
s
s
ages when r
e
ad
i
ng
p
a
t
ch
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-04-10
P
hill
i
p Wood
re
b
ase: remove a coup
l
e of red
u
ndant strategy tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-04-10
Philli
p
W
o
od
r
ebase
-m: fix serialization of
strategy opt
i
ons
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-04-10
Phillip Wood
rebase
-
m: cleanup --strategy-option handl
i
ng
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-04-10
Phil
l
ip Wood
seq
u
e
n
cer: use struct strv
e
c to st
o
re merge
strategy
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-04-10
Ph
i
llip Wood
reb
a
se: stop reading and
wr
i
ting unn
e
cessary
s
trategy
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-03-20
Phill
i
p
W
oo
d
wi
l
dm
a
t
c
h: hide inte
r
nal return
v
alues
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-03-20
Phillip
W
ood
wildm
a
tch: avoi
d
undefined beha
v
ior
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-03-20
Phillip Wood
wildm
a
t
ch: fix exponentia
l
beha
v
ior
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-02-23
Phi
l
lip Wood
rebase -i: fix p
a
rsing of "fixup -C<
c
o
mmit>"
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-02-23
Phi
l
lip Wood
rebase -i: match
who
l
e
word
i
n
i
s
_command()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-02-21
P
hil
l
ip Wood
r
ebase -i: check labels
and refs when parsing to
d
o
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-01-13
Phillip Woo
d
rebase:
cleanup "--exec" option ha
n
dling
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-01-04
P
h
ill
i
p Wood
c
i
(github)
:
r
e
s
t
ore "pri
n
t
test fa
i
lures" step name
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-11
Phi
l
lip Wood
s
equencer: tighten labe
l
l
ookups
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-11
Phillip Woo
d
sequencer: unify label
l
ookup
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-10
Phillip Wo
o
d
git_parse_si
g
n
ed(): avoid i
n
teger o
v
erflow
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-10
Phil
l
i
p Wood
config: require
at le
a
s
t
one d
i
git when
p
arsing numbers
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-10
Phillip Wood
g
i
t
_p
a
rse_unsigned: reject negative
v
alues
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-09
Phil
l
ip Wood
re
b
ase: stop exporting GIT_R
E
FLOG
_
ACTION
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-09
Ph
i
llip Wood
sequ
e
ncer:
s
t
op
exporting GIT_REFLOG_A
C
TION
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
h
illip
W
ood
rebas
e
:
c
leanup action
handling
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebase --abort: im
p
rove r
e
flog m
e
ssage
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Philli
p
Wood
re
b
ase -
-
a
p
ply:
m
ake reflo
g
messages match rebase
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phi
l
l
i
p Wood
rebase
--app
l
y: resp
e
ct GIT_REFLOG
_
ACTION
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
reb
a
se --merge: fix reflog me
s
sag
e
af
t
er skipping
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
hill
i
p
W
ood
reba
s
e -
-
merg
e
: fix reflog when
conti
n
uing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
t3406: rework
r
e
base reflo
g
t
ests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Woo
d
reba
s
e
-
-apply: remove
d
uplica
t
ed
code
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
hilli
p
Woo
d
re
b
ase --keep-base: im
p
ly --
n
o
-
fork-point
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip W
o
o
d
rebase --keep-base: imply --reapp
l
y-ch
e
rry-pic
k
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
hillip Wood
rebase: fa
c
tor out bran
c
h_base cal
c
ula
t
ion
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
r
ebase: renam
e
merge_
b
a
se
t
o branch_base
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip W
o
od
rebase: s
t
ore orig_head as
a commit
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
hil
l
ip W
o
od
rebase: be stricter whe
n
r
eadi
n
g
stat
e
fil
e
s cont
a
ining
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Woo
d
t
3416:
s
et $EDITOR in
s
ubs
h
ell
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
h
illip Wood
t3416: tighte
n
t
w
o tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-10
Phillip Wood
t3435
:
r
emove re
d
undant test c
a
se
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-05
Phill
i
p Wood
ssh
signing:
ret
u
rn a
n
error when sign
a
ture cannot
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-03
Phillip Wood
mailinfo -b: fix an out of bo
u
nds access
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-08-04
Phillip
W
ood
test
s
: ca
c
he
g
libc version c
h
eck
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
P
hillip Wo
o
d
xdiff:
introduce XDL_
A
LLOC_GROW()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
Phillip
Wood
xdiff: i
n
troduce XDL_
C
A
L
LOC_
A
RRAY()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
Phillip Wood
xdiff: introduce xdl
_
callo
c
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
Ph
i
llip W
o
od
xd
i
f
f
:
i
n
troduce XDL_
A
LLOC_ARRAY()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-04-11
Phillip Wood
tests: make SANITIZE=add
r
es
s
im
p
ly T
E
S
T
_NO_
M
A
LLOC_CHECK
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-31
P
h
illip Wood
worktr
e
e: add -z option
for list subcom
m
and
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
P
h
il
l
ip Wood
t
ermin
a
l:
restore se
t
tings
on SI
G
TSTP
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
Phillip Wo
o
d
terminal: w
o
rk around macos poll()
bug
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
Phi
l
lip Wood
t
e
rm
i
n
a
l: don
'
t
assume stdi
n
is /dev
/
tty
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
Phillip Wood
terminal: use flags for save_term()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Philli
p
Wood
add -p
:
disab
l
e stdin buffering when i
n
t
e
r
a
ctive
.
sing
l
ekey
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Phil
l
ip
Wood
terminal: set VMIN and VTIME
i
n n
o
n
-
canon
i
cal mode
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
P
hillip
W
o
od
terminal: pop sig
n
al
handler
when te
r
mina
l
is r
e
stored
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Phillip Wood
termina
l
:
always r
e
se
t
t
e
rminal w
h
en
readin
g
wi
t
hout
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Phillip
W
o
od
xdiff:
handle allocation failu
r
e when merg
i
ng
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Ph
i
ll
i
p
Wood
x
d
i
ff: re
f
ac
t
or a fu
n
ctio
n
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Phillip Wood
xdiff: handle
all
o
c
ation failure in patience
d
iff
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Phillip Wood
xdiff: fi
x
a me
m
o
r
y leak
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
P
h
illip Wood
r
e
b
as
e
-m: don't fork git checkout
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
rebase --apply:
s
e
t
ORIG_HEAD correctly
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
rebase --apply:
f
ix refl
o
g
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
P
h
illip Wood
reset_head(
)
:
t
ake struct rebase_head_
o
pts
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
reb
a
se: cleanup rese
t
_head
(
) cal
l
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip
Wood
create_au
t
o
s
tash(): remove unneeded
parameter
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phill
i
p Wood
reset
_
head():
make
d
efault
_
reflog_action op
t
ional
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
P
hillip Wood
r
e
set_hea
d
(): fac
t
or out r
e
f updates
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phill
i
p Wo
o
d
r
e
s
e
t
_head()
:
remove actio
n
paramete
r
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
rebase --apply
:
don't run post-chec
k
out h
o
o
k
if there
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
next