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
.gitattributes: add conflict-marker-size for relevant files
2018-06-12
Luk
e
D
i
a
ma
n
d
gi
t
-p4:
a
u
to-s
i
ze the block
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diam
a
n
d
git-
p
4
: narro
w
the scope of exception
s
c
aught when
.
.
.
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2018-06-12
Luke D
i
am
a
n
d
git-p4:
r
aise exceptions from p4CmdList based on error
.
.
.
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diamand
git-p4: better er
r
or re
p
or
t
ing
w
hen p4 fails
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2018-06-12
Luke Di
a
mand
git-p4:
add
o
p
tio
n
t
o disable syncing of
p
4
/master
.
.
.
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2018-06-12
Luke D
i
amand
gi
t
-p4: dis
a
ble-rebase: allow set
t
ing this via configurat
i
on
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2018-05-23
Luke Diamand
git-p4: add unshelve co
m
m
and
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2017-12-22
Luke Diamand
g
i
t-p
4
: update mu
l
ti
p
le shelved c
h
ange lis
t
s
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2017-04-17
Luke Diamand
git-p4
:
don't
u
se
n
a
m
e-rev t
o
g
e
t curren
t
branch
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2017-04-17
Luke
D
iamand
git-p4: add read_
p
i
pe
_
text(
)
i
nternal
f
unctio
n
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2017-04-17
Lu
k
e
D
i
a
mand
g
i
t-p4:
add faili
n
g
t
est for n
a
m
e
-rev ra
t
her t
h
a
n
s
ymbolic-ref
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2016-12-18
Luke Diama
n
d
git-p4: avoi
d
crash addin
g
syml
i
n
k
ed directory
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2016-12-14
Luke Diamand
git-p
4
: support git worktrees
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2016-12-05
Luke Diamand
git-p4:
s
upport upda
t
ing
an existing shelv
e
d chang
e
list
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2016-04-26
Luk
e
Diamand
git-p4 tests:
time
_
i
n
_seco
n
ds shou
l
d use $PYTHON_PATH
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2016-04-26
L
uke Di
a
ma
n
d
g
i
t
-
p4 te
s
ts: work with python3 as well
a
s
p
ython2
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2016-04-26
L
u
ke Diamand
gi
t
-p4 t
e
sts: c
d
to / before ru
n
nin
g
python
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2015-12-14
Lu
k
e Diamand
git-p
4
: failing test
case fo
r
skipping
c
h
a
n
ges with
.
.
.
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2015-11-24
Luke Diamand
g
i
t-p4:
w
o
r
k wit
h
a
detached
head
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2015-11-24
Lu
k
e
D
i
amand
git-p4: a
d
d
o
ption to system() to
return
s
ubshell
s
tatus
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2015-11-24
L
uke Diam
a
n
d
g
it-p4: add failing test for s
u
bm
i
t
f
ro
m
deta
c
hed head
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2015-08-28
Luke Diam
a
nd
git-p4: fix P4
l
a
bel import
f
or u
n
p
r
o
cesse
d
c
o
mmits
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2015-08-28
L
u
ke D
i
a
m
and
git-p4:
d
o not terminate creating tag
f
or u
n
known com
m
it
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2015-08-28
Luke Diamand
g
i
t
-
p
4: fai
l
ing test for ignoring invalid p4 labels
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2015-06-10
Luke Dia
m
and
git-p4: fixing --c
h
anges-bl
o
ck-size
h
and
l
ing
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2015-06-10
Luke Diama
n
d
git-p4: ad
d
t
e
sts for
non-n
u
meri
c
r
evis
i
on range
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2015-06-08
Luke Diamand
git-p
4
: test
with
l
imited p4 ser
v
er results
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2015-06-08
L
u
ke Diamand
git-p4: additional tes
t
ing of --changes-blo
c
k
-
size
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2015-05-26
Lu
k
e
Diamand
git-
p
4:
t
e
s
t
s: use test
-
chm
t
ime i
n
place of touch
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2015-05-24
L
uk
e
Diamand
git-p4
:
fix hand
l
ing of multi-word P4EDITOR
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2015-05-24
Luke Diamand
git-p4
:
add
f
ailing test
for P4EDITOR handli
n
g
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2015-04-28
L
u
k
e Diamand
g
i
t
-
p
4: add failing t
e
sts
for ca
s
e-folding p4d
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2015-04-28
Lu
k
e Diamand
g
it
-
p4: t9814: prevent
-
-ch
a
in-lint fai
l
ure
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2015-04-04
L
uke Diama
n
d
gi
t
-
p4:
s
mall fix for loc
k
ed-file-
m
ove-t
e
s
t
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2015-04-04
Luke D
i
amand
git-p4: fi
x
small
bug in l
o
cked
te
s
t scripts
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2015-02-11
Luke Diamand
git
-
p
4: suppo
r
t
exclud
i
ng p
a
t
h
s
o
n sync
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2015-01-23
Luke Di
a
mand
git-p4: c
o
rrec
t
--prepare-p4-onl
y
i
nstructions
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2012-05-11
Lu
k
e Di
a
m
and
git p4: fix bug when
enabling
t
a
g
i
mport/export via
.
.
.
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2012-05-11
Luke Diamand
g
i
t p4:
f
ix bug when verbose enabled wit
h
tag export
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2012-05-11
Luke
D
i
a
mand
git p4: add test fo
r
tag import/export enabled via
.
.
.
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2012-04-25
Luke Diama
n
d
git p4: fix
unit tests
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2012-04-24
Luke
D
iamand
git p4: move ve
r
b
o
se to base class
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2012-04-24
Luke Diamand
git p4: Ignor
e
P4EDITO
R
if it is empty
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2012-04-24
Lu
k
e Dia
m
and
git p4:
S
q
uash
P
4
E
DITOR
in test ha
r
ness
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2012-04-24
Luk
e
Diamand
git p4: f
i
x-up "import/export of l
a
bels to
/
from p4"
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2012-04-11
Luk
e
Diamand
gi
t
p4
:
i
mport/export of label
s
to/fro
m
p4
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2012-04-11
Luke Diam
a
nd
git p4: F
i
x
ing scri
p
t edito
r
checks
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2012-02-23
Lu
k
e
Diamand
g
i
t-p4: add initial support
f
or RCS k
e
ywords
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2012-01-20
Luke
D
i
a
m
a
n
d
git-p4: la
b
el impo
r
t fails with multiple labels
a
t
.
.
.
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2012-01-20
Luke
Diamand
git-p4
:
add
test for p4 la
b
els
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2012-01-20
Luke Diamand
git-p
4
: importing
l
abel
s
should
c
o
pe with missi
n
g
owner
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2012-01-20
Luke D
i
a
mand
git-p4:
c
ope w
i
th labels with empty
d
e
scripti
o
ns
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2012-01-20
Lu
k
e Diama
n
d
git-p4: handle p4 branches a
n
d labels containing shell
.
.
.
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2011-10-18
Luke Diamand
git-p4: h
a
ndle files
w
i
t
h
shell meta
c
haracters
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2011-05-13
Luke Diamand
git-p4: wa
r
n
i
f git auth
o
rs
h
ip wo
n
't
b
e
retain
e
d
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2011-05-09
Lu
k
e
D
iamand
git-p4: sm
a
ll impr
o
vements to user-prese
r
v
at
i
on
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2011-04-26
Luke Diamand
git-p
4
: add o
p
tio
n
to
preserve use
r
n
a
mes
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree
2009-08-10
Luke Diamand
g
i
t-p4:
s
tre
a
m from
perforce to speed up clon
e
s
Signed-off-by:
Luke Diamand
<luke@diamand.org>
commit
|
commitdiff
|
tree