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
rebase: refuse to switch to a branch already checked out elsewhere (test)
2023-01-13
Phillip
W
ood
reb
a
se: cleanup
"-
-
e
x
ec
"
o
p
t
ion hand
l
ing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-01-04
Phillip Wood
c
i(github): restore "p
r
int test
f
ail
u
r
es" ste
p
name
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-11
P
hil
l
ip Wo
o
d
sequencer: tighten l
a
bel lookups
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-11
Ph
i
llip Wood
sequencer
:
unify label lookup
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-10
Phillip Wood
git_parse_signed
(
):
a
void
i
nteger overflow
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-10
Phillip Wood
config: require at l
e
ast one digit
w
hen
pars
i
ng num
b
e
r
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-10
Phillip Wood
git_parse_uns
i
gned: re
j
ect negat
i
ve values
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-09
Phillip Wood
r
ebase: stop exporting GIT_REFLO
G
_ACTION
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-09
Phil
l
ip
Wo
o
d
seq
u
encer: stop exporti
n
g G
I
T_REFL
O
G_AC
T
ION
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Ph
i
l
l
ip Wo
o
d
rebase: cle
a
n
up action hand
l
ing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebase --abort: improve
r
e
f
log me
s
s
a
g
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phil
l
i
p
Wood
rebase --apply: make reflog messages match re
b
ase
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wo
o
d
rebase --ap
p
ly: respect GIT_
R
E
FLOG_ACTION
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
r
e
b
ase --me
r
ge: fix reflog
m
e
s
s
ag
e
after
skipping
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Philli
p
Wo
o
d
r
e
base --merge: fix reflog
when contin
u
ing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
t3406: rework rebase
ref
l
og
test
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
h
illip Wood
rebase --apply: remove d
u
pli
c
ated c
o
d
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
reba
s
e
--keep-base: imply --no-fork-point
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
h
illip Wood
rebas
e
--
k
eep
-
ba
s
e: i
m
ply
--reapply-
c
her
r
y-pi
c
ks
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
hill
i
p Wood
rebase: fact
o
r
out branch_
b
a
s
e
calcu
l
ation
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
r
eb
a
se: rename merge_
b
ase t
o
branch
_
base
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Ph
i
llip Wood
reb
a
se: sto
r
e orig_head as a commit
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
hil
l
i
p Wood
re
b
ase: be st
r
ic
t
er when reading sta
t
e
f
ile
s
c
o
ntaining
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phill
i
p Wood
t3416: set $ED
I
T
OR in su
b
shell
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Philli
p
W
o
od
t3416: tighten two tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-10
Phill
i
p W
o
od
t3435: remov
e
redun
d
a
nt test
c
ase
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-05
Phillip Wood
ssh
s
ig
n
i
ng: return an error when signatur
e
c
an
n
ot
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-03
Phil
l
i
p
Wood
m
a
ilinfo -b
:
fix an ou
t
o
f b
o
und
s
access
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-08-04
Phil
l
ip Wood
tests: cache glibc version c
h
eck
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
Phil
l
ip Wood
xdif
f
:
i
n
troduc
e
XDL_ALLOC_GROW()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
Philli
p
Wood
xdif
f
: introduce X
D
L_CALLOC_ARR
A
Y()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
Phillip Wood
xdiff
:
int
r
odu
c
e
xdl_ca
l
loc
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
Phillip Wood
xd
i
ff: intro
d
uce
XD
L
_ALLOC_ARRAY(
)
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-04-11
Phillip W
o
od
tests: make SANITIZE=address
i
m
ply T
E
ST_
N
O_MA
L
L
OC
_
CHE
C
K
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-31
P
h
il
l
ip W
o
o
d
work
t
ree: add -z option for list subco
m
m
and
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
Phillip Wood
t
erminal: restore setting
s
on
SIGTSTP
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
P
h
il
l
i
p
Wood
ter
m
inal: work ar
o
und macos poll() b
u
g
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
Phillip Wood
terminal
:
don't assume stdin is /dev/tty
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
Phillip Wood
ter
m
i
n
al: use flags for sav
e
_ter
m
()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Phillip W
o
od
a
dd -p: dis
a
ble stdin buffering when in
t
eractive
.
single
k
ey
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Phillip Wood
ter
m
inal: set
VMI
N
and VTIME in non
-
canonical mod
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Phillip
Wood
terminal: pop sig
n
al handler
w
hen
termi
n
a
l is rest
o
red
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Phil
l
ip Wo
o
d
terminal: always reset ter
m
inal when reading
wit
h
o
u
t
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Phillip
Wood
xd
i
ff
:
handle allocation failure
when merging
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Phil
l
ip Wood
xdiff: re
f
actor a function
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Phillip Wood
xdi
f
f: handle allocatio
n
failure in pati
e
nce diff
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Phillip Wood
x
d
i
f
f
:
fix a me
m
or
y
leak
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phil
l
ip Wo
o
d
r
e
base -m: don't fork git check
o
ut
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
rebase --apply: set
ORIG
_
HEAD
c
orre
c
tly
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
r
e
base --apply: fix reflog
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
reset_head(
)
: take stru
c
t rebase_head_o
p
ts
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip
W
ood
rebase: cleanup reset_hea
d
() calls
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wo
o
d
c
r
eate_autos
t
ash(): remo
v
e
unneeded parameter
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Philli
p
Wood
r
e
set_head(): make d
e
fault_reflog
_
acti
o
n o
p
tional
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip W
o
od
res
e
t_head()
:
f
actor out
ref updates
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
P
h
i
llip W
o
od
reset_head(): remove action paramete
r
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Ph
i
l
l
i
p Wood
r
ebase --a
p
p
l
y: don't ru
n
post-checkout hook
i
f there
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
r
e
base: do n
o
t re
m
ov
e
untracked
files on checkout
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phill
i
p
Wood
r
e
base: pass
c
orre
c
t ar
g
uments t
o
post-checkout hook
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phi
l
l
ip Wo
o
d
t5403:
r
efactor rebase post-
c
h
e
ckout ho
o
k tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Woo
d
reba
s
e: factor out checkout for up to da
t
e bran
c
h
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-12
Phill
i
p Woo
d
builtin add -p: fix hunk splitting
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-12
Phil
l
i
p
Wood
t3701: clean up hunk splitting tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
d
iff --
c
olor-moved: intern strings
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff: use designated
initi
a
l
izers for
e
mitted
_
diff_sy
m
bol
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
di
f
f --color
-
m
oved-
w
s
=al
l
ow-i
n
dentation-change: improve
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Ph
i
llip Wood
diff --col
o
r-moved: stop cl
e
aring potential moved blocks
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phil
l
i
p
W
o
od
d
i
ff -
-
color-moved
:
shrin
k
p
o
tenti
a
l mo
v
e
d b
l
ocks as
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Ph
i
l
lip Wood
dif
f
--color-mov
e
d: uni
f
y
moved block growth funct
i
ons
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phill
i
p Wood
diff --co
l
or-mo
v
ed: cal
l
com
p
aris
o
n
function directly
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip
Wood
d
i
f
f -
-
color-moved-ws=al
l
ow-indentation
-
change
:
simplify
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip
Wo
o
d
diff: simplify
all
o
w-i
n
d
ent
a
tion-change delt
a
calc
u
lation
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff --
c
olo
r
-moved:
a
void false sho
r
t line matches
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
P
h
illip Wood
d
iff --color
-
m
oved=zeb
r
a: fix alte
r
na
t
e colo
r
i
n
g
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff --c
o
lo
r
-moved: rewind when
d
iscarding pm
b
commit
|
commitdiff
|
tree
2021-12-09
Phill
i
p Wood
diff
--col
o
r-mo
v
ed: facto
r
out function
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phill
i
p
Wood
diff --colo
r
-moved: c
l
ear al
l
flags on block
s
that
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff --col
o
r-moved: add perf tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-01
Phillip Wood
x
d
if
f
: implement a z
e
alo
u
s diff3, or "zdiff3
"
Signed-off-by:
Phillip Wood
<phillip.wood123@gmail.com>
commit
|
commitdiff
|
tree
2021-11-19
Ph
i
llip W
o
o
d
xdiff: simplify com
p
a
rison
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-11-19
P
hillip
W
o
od
xdif
f
: avoid
u
n
n
ecessary
m
e
mory alloc
a
ti
o
ns
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-11-19
Phillip Wood
di
f
f histogram
:
intern strings
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-11-03
Phill
i
p Wood
rebase -i: fix r
e
wordin
g
wi
t
h -
-
comm
i
tt
e
r-da
t
e-is-aut
h
or
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-10-18
P
h
il
l
ip
Wo
o
d
t1092:
r
un "rebase --a
p
pl
y
" without "-q"
in te
s
ti
n
g
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-10-07
Phillip Wood
sparse index: fix use-after-free b
u
g in cache_tree_ve
r
ify()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-24
Phill
i
p
W
oo
d
rebase: fix todo-list
r
erea
d
ing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-24
Phill
i
p Wood
seque
n
ce
r
.
c
:
factor
o
ut a function
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-22
Phil
l
i
p
Wood
rebas
e
:
d
eref
e
rence tag
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-22
Phi
l
lip Wood
rebase: use lookup
_
commit_r
e
fe
r
e
n
ce_by_name()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-22
Phillip Wood
reb
a
se:
use our
standard error
r
et
u
rn value
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Ph
i
llip W
o
od
t3407:
rework rebase --quit tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Ph
i
llip Wood
t
3407: strengthen re
b
ase --abort tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phillip Woo
d
t3407:
u
se test_path_is_missing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phillip Wood
t34
0
7: rename a
variable
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phi
l
lip Wo
o
d
t3
4
07
:
use
t
est_cmp_
r
e
v
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phillip Wood
t3407
:
u
s
e
test_commit
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phillip W
o
o
d
t340
7
: run test
s
in $TEST_DIRECTOR
Y
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-23
Phillip Wood
rebase -r: fix merge -c
with a merge str
a
t
egy
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-23
Phil
l
ip Wood
rebase
-
r:
don't write
.
git/
M
ERGE_MSG when
fast-forwarding
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-23
Phillip Wood
rebase -i: add another reword test
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
next