repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Avoid creating non-p4 branches in remotes/p4 off of remotes/origin
2007-05-25
Simon Hausm
a
nn
Avoi
d
creating non-p4 bra
n
ches in remo
t
es/p4 off
of
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-24
Simon Hausm
a
nn
O
o
ps, fix --with-origin to /reall
y
/ also call
git f
e
tch :)
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-24
Sim
o
n Hausmann
Added su
p
port for --with-origin with mult
i
-branch imports
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-24
Simon Hausmann
F
o
rgot to rem
o
ve
this return stateme
n
t
f
rom debugging
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-24
S
i
mon Ha
u
smann
Fix creati
n
g
the remotes/
p
4 branches based on origin
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-23
Simon
H
ausmann
Load the user map
from p4
o
n
l
y once at run-ti
m
e
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-22
S
i
mon Hausmann
D
o
c updat
e
s
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Haus
m
ann
F
i
x
conversion fro
m
old
style heads/
p
4 to remo
t
es/p4
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-20
Simo
n
Hausma
n
n
Another
(
potentially
l
ife-s
a
v
i
ng) idea for
s
ubm
i
t
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-20
S
i
mon Hau
s
m
ann
H
a
d an idea for debugging, rec
o
r
d it :)
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-20
Simo
n
Hausmann
Added support
f
or gi
t
-p4 submit -
-
direct
(
experimen
t
a
l
)
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-20
Simon Ha
u
smann
Use git
f
ormat-patch a
n
d git app
l
y
--ap
p
ly when
extracting
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-20
Si
m
on Haus
m
ann
O
ops,
n
ot only
/
set/ gitdir on clone, also set
i
t
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-20
Si
m
o
n
H
ausmann
Fix
g
itdir not being set when
cloning
.
N
e
eded for
writing
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-20
Simon Hausmann
Cache the output of
"
p
4
users" for fast
e
r syncs on
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Re
m
o
v
e
d todo item that is implemente
d
:)
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Simon
Hausmann
Add
e
d s
u
pport for git-p4 sync/re
b
ase --with-origin
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Bite
t
he bulle
t
and automatica
l
ly convert old s
t
yle
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Changed the
d
e
fault p4 imp
o
rt branch to be
r
efs/re
m
ot
e
s
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Crea
t
e the origi
n
b
ased imp
o
r
t branch
using
g
it u
p
d
ate
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Si
m
on Ha
u
smann
Re
m
oved ancien
t
and un
u
sed code to find t
h
e
last
i
m
p
o
rted
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
S
i
m
on H
a
usmann
Remove
d
c
l
ean
t
ags
command
.
It doesn't have any meaning
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Sim
o
n
Hau
s
mann
Clean up co
d
e duplication fo
r
r
e
vision par
s
i
ng
and
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Simon
Hausmann
Always pass a sha1 for the initial
p
a
rent
so that g
i
t
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausma
n
n
Fixing syncing (gitdir
discover
y
/ c
d
) for bare re
p
osito
r
ies
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausma
n
n
Make git-p4 work
with bare repos
i
tories
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-07
Simo
n
Hausmann
Do
c
ume
n
t some implementation details, for the curious
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-01
Si
m
on
H
a
usmann
C
leanup,
removed t
h
e old
tagging c
o
de
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-01
Simon Ha
u
sm
a
nn
c
l
eanup,
r
enamed
s
elf
.
globalPre
f
ix to
s
elf
.
d
epo
t
Path
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
Micro cle
a
nup
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
Doc clean
u
ps
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hausmann
H
an
d
le pat
c
h errors in
g
it
-
p4 su
b
mit bett
e
r
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-15
Simon Ha
u
smann
A
new atte
m
pt at fixing the
c
h
ild-fast-import-process
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausmann
Slightl
y
im
p
rov
e
d
f
ormatti
n
g of the ra
w
_in
p
u
t
questions
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausmann
Removed the old patch a
p
ply code from
g
it-p4 su
b
mit
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausmann
F
ix t
h
e t
i
mezone formatting
.
No
w
qgit a
l
so displ
a
ys
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-13
Si
m
on Hausmann
Prin
t
an
error message o
f
some so
r
t i
f
gi
t
fast-
i
mpo
r
t
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-09
S
imon
H
ausman
n
Allow for convenient rebasing after git-p4 submit
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-08
Simon
Hau
s
mann
Added a
simpl
e
exampl
e
of usage to the "documentation" :)
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
fix variable
usa
g
e (oops)
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausm
a
nn
Fix file determ
i
nation
f
o
r
#head imports
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-08
Simon Haus
m
ann
A
d
d
e
d git-p4 c
l
one convenience command
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
Hono
r
--
s
ilent fo
r
labels
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-07
Simon H
a
usmann
Tur
n
o
f
f pote
n
tially
s
low label d
e
tection
b
y de
f
au
l
t
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-07
Simon
H
a
usmann
Provi
d
e a tree
s
u
mma
r
y a
f
ter git-p4 rebase
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausmann
Added
g
it-p4 rebase c
o
n
v
eni
e
nce
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-25
Simon Hausmann
Don't try to parse any options with git-
p
4
debu
g
but
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-24
S
i
mon H
a
u
s
m
ann
Pre
f
er
g
it command
o
ver gi
t
-comm
a
nd
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-24
Simo
n
H
a
u
sman
n
Mino
r
cosmetic fixlet fo
r
the gi
t
-p4
s
ub
m
it sync q
u
estio
n
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hau
s
mann
Different versions of
p
4 have dif
f
e
r
e
nt out
p
ut for
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Brand new
s
mart incremen
t
al import
that
d
oesn't need
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-22
Simo
n
Hausmann
S
e
t the default branch in
r
un, not in the
constructor
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
H
e
lper fun
c
tion to
c
heck
the existanc
e
o
f a re
v
ision
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-22
Simo
n
Hausmann
Added som
e
h
elper function(s) to parse the depot p
a
t
h
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausm
a
nn
C
hanged the defa
u
lt bra
n
ch for
impo
r
ts from "mas
t
er
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Ch
a
nged
t
h
e
format
o
f t
h
e imported log message slightly
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Don't show the s
u
bmit t
e
m
p
late and the diff fi
r
st i
n
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-21
S
imon Hausmann
Docum
e
nta
t
ion enhancements
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-14
Simo
n
Hausmann
Auto-dete
c
t th
e
current git br
a
nch
before s
u
bmitting
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
I
gnore App
l
e resource files when import
i
ng from perforce
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-10
Simon
H
ausmann
Make the p4 data
/
command cache c
o
nfigurable through
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-10
Simon Haus
m
ann
F
i
x
e
d
p4-d
e
bug fil
e
ext
e
nsion
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-12
Sim
o
n
H
ausmann
When
tryi
n
g
to
ma
p
p4 integr
a
tio
n
s
to git merges
j
ust
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausman
n
Set g
i
t fast-import marks
for ev
e
ry imported cha
n
g
e
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-12
Simon
H
a
usm
a
nn
After
m
arking
a
p4 branch as merged don'
t
ev
e
r
merge
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-12
Simon H
a
us
m
ann
More fixes in
he
u
rist
i
c p4 branch detection b
a
sed on
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-12
S
imon
H
a
usmann
Star
t
ed
w
o
r
k on p4
b
ranch detection
(expe
r
imental!)
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-12
Sim
o
n Hausmann
C
o
de cleanups
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-11
S
i
m
o
n Ha
u
smann
Cleanups, re
m
ove u
n
used v
a
r
ia
b
l
e
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-11
Simon
H
ausmann
Crea
t
e
lightweight git t
a
gs (using the "reset" trick
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-10
Simon Haus
m
an
n
Cha
n
ged the de
f
ault
git import branch from "p4
"
to
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausman
n
Avoid the exces
s
ive
use of git
t
ags for every pe
r
force
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-10
Si
m
on
Haus
m
ann
Min
o
r code cleanups
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-08
Si
m
on
Hausmann
Added a little helper sc
r
ipt to debug the out
p
ut
o
f
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree