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
Fix depot-path determination for git-p4 submit
2007-06-07
Simon Hausmann
Fix depot
-
p
ath d
e
te
r
mination fo
r
git
-
p4 s
u
bmit
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Si
m
on Hausmann
F
ix git-p
4
sub
m
it
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
Fi
x
git-p4
r
ebase
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
S
imon
H
ausmann
Hack t
o
make
the multi-branch import wor
k
again with
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Simon H
a
usmann
Do
n
't
a
t
t
empt to set th
e
in
i
tialPa
r
e
n
t
on multi-branch
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hau
s
ma
n
n
Fix
common
p
a
t
h "calcula
t
ion" from logs of multiple
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Sim
o
n Hausmann
F
ix
support f
o
r "depot-path"
in o
l
der git-p4 imports
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
Si
m
on Hausmann
Shortcut the
case w
h
ere
we ha
v
e no origin
branch
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
Simon Ha
u
smann
Mak
e
--with-origin the default
f
or sy
n
cing
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
S
imon Hausmann
M
ake --with-origin
also
w
o
rk without origin :)
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-24
Marius Storm-Olsen
Replace \r\n wi
t
h \n
w
h
en impo
r
ting from
p
4 on Windo
w
s
commit
|
commitdiff
|
tree
2007-05-23
Simon Hau
s
mann
Fix multi
-
b
r
anch import
w
i
th -
-
s
ilent
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausmann
Fix p4 execution in git-p4 rollbac
k
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
S
i
mon Hau
s
mann
Ca
t
ch
p
4 e
r
rors i
n
rollback early e
n
ough (befor
e
delet
i
ng
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Si
m
on Hausmann
O
ops,
f
ill the /list/ correct with the p4 exit
c
ode
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simo
n
Hausmann
Don't make
l
en(p4Cmd
(
"p4 changes -m 1
/
/
f
oo/
.
.
.
"))
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausmann
Make rollback work with locally imp
o
r
t
ed
branches
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausmann
A
void
calling git symboli
c
-ref refs
/
h
e
a
ds/
p
4//HEAD
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Simon Hausmann
Use refs/heads/*
i
n
s
tead of ref
s
/
h
ea
d
s/p4/* for local
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
S
imon Hausmann
Added supp
o
rt for --m
a
x-chan
g
es=
<
co
u
nt>
to e
a
se impo
r
t
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Simon
Hausmann
Adde
d
suppo
r
t for importing mul
t
iple branches i
n
to
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Ha
u
smann
Fixes for rollback, d
e
lete branche
s
that
did not
exist
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Si
m
o
n
Hausmann
Fix b
r
anch detectio
n
in
mult
i
-bran
c
h imports
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Sim
o
n
Haus
m
an
n
Added
a
rollba
c
k co
m
mand
f
o
r debugg
i
ng
.
I
t sets back
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Sim
o
n Hausmann
Make git-p4 submit
-
-d
i
r
ect safe
r
by also creating
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausma
n
n
D
e
tect with
g
it-p4 submit --d
i
rect when
there are no
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
S
imon Hau
s
man
n
Fix g
i
t
s
ymbo
l
i
c
-ref warning on initial
c
l
o
ne
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Fix
e
rror
detection
w
ith git-p4
submit when the reques
t
ed
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-20
Simon Hausmann
Im
p
r
o
ved output
for m
u
lti
branch
imports and noted
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-20
S
i
m
on
H
aus
m
a
n
n
S
peci
f
yi
n
g --det
e
ct
-
b
ranches is now on
l
y needed for
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simon
H
ausmann
R
emoved unus
e
d variab
l
e, more cleanups
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simon Hausmann
Mo
r
e cleanups and speedups
f
o
r
l
abe
l
s and branche
s
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simon Hau
s
mann
Cl
e
a
n
up
/
speed up the branch<
>
file split
a
nd removed
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simon
H
ausmann
M
o
re work on the incremental impor
t
ing o
f
mul
t
iple
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Si
m
o
n
Hausm
a
nn
G
ive branc
h
e
s
a nice
p
rojec
t
prefix an
d
do
n
't bail
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon
H
ausmann
Sta
r
ted rewritin
g
t
h
e
branch detectio
n
, based on "p4
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
S
i
mon Haus
m
ann
Remo
v
ed unused
c
ache variables
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hausma
n
n
Fi
x
branch setu
p
after initi
a
l clone
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hau
s
mann
A littl
e
tod
o
n
o
te befo
r
e I f
o
rget it :)
,
based on
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
S
i
mon Hausmann
Fi
x
c
allin
g
git-p4 rebase from within a
subd
i
rectory
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
S
i
m
on
H
ausmann
Give a
better hint if git-p
4
submit fai
l
s
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
Ad
d
ed
th
e
possi
b
il
i
ty
o
f skipp
i
ng pa
t
ches duri
n
g
g
i
t
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-15
S
i
mon Hausmann
F
i
x
gi
t
-p4 cl
o
n
e
//depot/proj
e
ct (he
a
d
imp
o
rt)
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-15
Mar
i
us Storm-Olsen
Make the command cal
l
sil
e
nt
commit
|
commitdiff
|
tree
2007-05-15
S
i
mon Hausmann
Conver
t
e
d to
unix n
e
wl
i
nes
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-15
Sim
o
n Hausmann
Ma
k
e submitting work o
n
Windows
.
commit
|
commitdiff
|
tree
2007-05-15
Si
m
on Hau
s
m
ann
M
ake sur
e
a
l
l popen ca
l
ls use binary mode (for Wi
n
dows
.
.
.
commit
|
commitdiff
|
tree
2007-05-15
S
imon
H
a
usmann
A
dded a little
.
bat wrapper from M
a
rius
commit
|
commitdiff
|
tree
2007-05-15
S
imon Hausmann
Use the s
u
bp
r
oc
e
ss modu
l
e instead
o
f
p
ope
n
2 to make
.
.
.
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausman
n
U
se the
new incr
e
m
e
ntal
import s
t
y
le by default
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-02-22
Simon Ha
u
s
m
an
n
Don't print a
plain newl
i
ne at the end of th
e
exe
c
ution
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-02-10
Simon
H
a
usmann
Added a li
t
tle helper script
to remove
u
nused tag
s
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
Simon
H
ausmann
Im
p
lemented basic support for converting th
e
d
ate o
f
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
Si
m
on Haus
m
ann
Slightly
im
p
rov
e
d help
u
sage outpu
t
and
mad
e
specifyi
n
g
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Added basic
s
upport
f
or specifying the depot path to
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-30
S
i
mon H
a
usman
n
Initial import of a python s
c
ript
t
o import cha
n
gesets
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree