repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix git-p4 rebase to detect the correct upstream branch instead of unconditionally
2007-06-12
Si
m
on H
a
us
m
a
n
n
Fix gi
t
-p4 rebase to d
e
tec
t
t
he correct upstream b
r
a
nch
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-12
Simon Hausma
n
n
Moved the co
d
e from gi
t
-p4 subm
i
t
t
o
figure out the
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
Fix depot
-
path
determi
n
ation for git-p4 submit
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Si
m
on Hausmann
Fix git-p4 submit
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Simon
H
a
u
sman
n
Fix git-p4 rebase
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
S
imon
Hausmann
Hack to
m
ake
t
h
e
multi-branch
i
m
port
work again with
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Sim
o
n Hausmann
D
o
n't atte
m
pt to set
t
he initialParent on
multi-branch
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Simon Haus
m
a
n
n
F
i
x
comm
o
n path "c
a
l
c
ulation" from logs of multiple
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
S
im
o
n H
a
us
m
a
n
n
Fix support for "depot-path" in older git-p4 imports
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
Simon Hau
s
mann
Shortcut the case where we have no origin branch
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
Simon
H
ausman
n
Make --with
-
or
i
gin the defa
u
lt fo
r
syncing
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
Simon Hausma
n
n
Ma
k
e
--
w
ith-ori
g
i
n
also
work without origi
n
:)
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Si
m
on Hausmann
Fix multi-branch impo
r
t with --silent
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
S
imon Ha
u
smann
Fix p4
executio
n
in
git-p4 rollback
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Si
m
on
Hausm
a
nn
C
a
t
c
h p4 errors in rollback
e
arl
y
enou
g
h (be
f
o
r
e dele
t
ing
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausma
n
n
Oops, fill the /list/ co
r
r
ect wi
t
h the p4 exit code
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausman
n
Don't
m
ake l
e
n(p4Cmd("p
4
c
h
anges
-m 1 //fo
o
/
.
.
.
"))
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausma
n
n
Make
r
o
llba
c
k w
o
r
k with
l
o
c
ally imported branches
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hau
s
mann
Av
o
id
c
alling
g
it symbo
l
ic
-
ref
r
efs/heads/p4//HEAD
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Simon Hau
s
man
n
Use ref
s
/heads/*
instead of
refs
/
he
a
ds/p4/* for local
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Simon
Haus
m
ann
Added suppo
r
t
f
o
r
--max-changes=
<
count> to ea
s
e imp
o
rt
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Sim
o
n Hausmann
Ad
d
ed suppo
r
t
for importing multiple b
r
a
n
ches into
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Fixe
s
for
r
ollback
,
delete
b
ranches that did
n
o
t exist
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
S
i
mon Hau
s
man
n
Fix branch de
t
ection
in m
u
l
ti-b
r
anch imports
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hau
s
mann
Added a r
o
llback comm
a
nd for debugg
i
ng
.
It
s
et
s
back
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Si
m
on H
a
u
s
m
ann
M
ake g
i
t-p4 submi
t
--direc
t
safer
by also creating
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon
H
ausmann
Detect
w
ith git-p4 submit --direct
when there are no
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Fix
g
it symbo
l
ic-ref
w
arni
n
g on i
n
itial clone
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon H
a
usmann
Fix
e
rror detection with git-p4
submi
t
when the requ
e
sted
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-20
Simon Hausmann
Improved output for mu
l
ti
b
r
a
nch imports and no
t
ed
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-20
Simon Hausmann
Specifying --de
t
ect
-
b
r
a
n
c
hes
i
s
now onl
y
needed for
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Si
m
on Haus
m
ann
Removed unused variable, mor
e
cleanups
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simon
H
au
s
mann
M
o
r
e
cleanups a
n
d spe
e
dups for labels and branches
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simo
n
Hausmann
Cleanup/speed up the branch<> fi
l
e split and
r
emoved
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simon Haus
m
ann
More
w
ork on the
i
ncremental
impo
r
ti
n
g of mult
i
p
l
e
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hausmann
Giv
e
branches a
n
ice project
prefix and
don't bail
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simo
n
H
a
usmann
Started
r
ewriting
t
h
e branch detec
t
ion, b
a
sed on "p
4
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
S
imon Hau
s
m
a
n
n
R
e
m
oved unus
e
d ca
c
he va
r
i
a
bles
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Sim
o
n H
a
u
s
m
ann
Fix branc
h
setup after initi
a
l clone
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon Ha
u
sm
a
nn
A
l
i
t
tle todo note befo
r
e I forget it :), based
o
n
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon Ha
u
smann
Fix
c
alling git-p4 rebase fro
m
wi
t
hin a subdi
r
ectory
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
Give
a
b
e
tter
h
in
t
if git-p
4
su
b
mit fai
l
s
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
S
imon Hausmann
Added the possibility
o
f skipping patche
s
during git
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-15
S
imon Hausmann
Fix git-p4 clone //depo
t
/pro
j
ect (head imp
o
rt)
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-15
Simon H
a
usmann
Conv
e
rted t
o
unix newlines
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-03-23
S
i
mon Hausmann
Use the new i
n
c
r
ement
a
l im
p
ort st
y
le by default
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
Don't
print a p
l
ain newline a
t
the end of the execution
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
A
dde
d
a little help
e
r script to remo
v
e un
u
sed
t
ags
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
S
i
mon H
a
usma
n
n
Imp
l
eme
n
ted b
a
s
i
c su
p
po
r
t for co
n
vert
i
ng the date of
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
Simon Ha
u
sm
a
nn
Slightly im
p
roved help usa
g
e
o
utput and made spe
c
ifyin
g
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Ad
d
ed ba
s
i
c
support
for
sp
e
c
i
fyin
g
the depot path to
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-30
Simon Hausmann
Initial im
p
o
rt
o
f
a
python script
t
o
impo
r
t chan
g
esets
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree