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
merge-recursive: move the global obuf to struct merge_options
2008-08-27
Simon
Hausmann
Make i
t
possible to abort the sub
m
issio
n
of a
c
hange
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-08-24
S
i
mon Haus
m
ann
Clean up the git-p
4
d
o
cumentation
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-03-04
Simon Hausmann
gi
t
-p4:
F
ix
import of
changese
t
s with file deletions
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
Si
m
on
H
a
usmann
git
-
p4: git-p4 su
b
mit clean
u
p
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
Simon H
a
u
smann
git-p4: Remo
v
ed git-p4
s
ubmi
t
--direct
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
Simon Hausmann
git-p
4
: Clean up
g
it-p4 s
u
bmit
'
s
log message handlin
g
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
Simon Hau
s
mann
git-p4: Rem
o
v
e
-
-log-substitutions feature
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-03
S
i
mon Hausmann
git-p4: Ensure the working d
i
rectory and the index
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-03
Simon Hausmann
git-p4
:
Fix submit user-interface
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-11-16
S
i
m
o
n
Hausmann
git-p4: Fix direct import from
perforce after
fetching
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-10-20
S
i
m
o
n
Hausmann
g
it
-
p4: W
h
en s
k
ippi
n
g a pa
t
ch as
part
o
f
"git-p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon H
a
usmann
git-p4: Added support f
o
r
a
utomatically i
m
port
i
ng ne
w
ly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon Hausmann
git-p4:
C
leanu
p
; moved the (duplicat
e
d) code f
o
r turning
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
S
i
mon
Hau
s
mann
g
i
t-p4: Clea
n
u
p
;
move
d
t
h
e
c
ode for the initial #head
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon Hausman
n
git-p
4
: Cleanu
p
; T
u
rn
self
.
revision
i
nt
o
a function
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon Hausmann
git-p4: Cleanup; moved the cod
e
to
i
m
port a li
s
t of
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon
H
ausmann
g
it-
p
4: Clean
u
p; moved th
e
cod
e
for gett
i
ng a sorte
d
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simo
n
Ha
u
smann
g
i
t-p4: After submissio
n
to
p
4
al
w
ays
s
ynchronize from
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon Hausmann
gi
t
-p4: Always call 'p
4
syn
c
.
.
.
'
b
efore
s
ubmittin
g
.
.
.
commit
|
commitdiff
|
tree
2007-08-25
Simon
H
ausman
n
git-p4: Fix warnin
g
s about
n
on
-
existant r
e
fs/remo
t
es
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-08-25
Si
m
on Hausmann
git-p4:
M
ake
'
git-p4 branches
'
work after an
i
nitial
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-08-08
Simon Hausmann
g
it-p4: Fi
x
git-
p
4 sub
m
it to
i
nclude
o
nly changed files
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-08-08
Simon Hausmann
git-p4: Fix su
p
p
o
rt for symlinks
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-07-25
Simon Hau
s
m
a
nn
git-p
4
: Fix p4 us
e
r cach
e
population on Windows
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-07-18
Simon Hausmann
git-p4: Cleanup, used co
m
mon func
t
ion for
listing imported
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-07-18
Simon H
a
u
s
mann
git-
p
4
:
Fi
x
u
pst
r
eam branch
d
etecti
o
n for submit/reb
a
s
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-07-18
Simon
Hausmann
git
-
p
4: Cl
e
anup, make listEx
i
s
t
ingP4Branche
s
a
g
lobal
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-27
Simon Ha
u
sma
n
n
git-n
e
w-workdir: Fix shell warning abo
u
t operator
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-21
Simon
H
a
us
m
ann
Mak
e
i
t
possible to specify the HEAD for the internal
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-20
Simon
H
ausmann
Added
g
it-p4 branches command that shows the mappi
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-17
Simon Ha
u
s
m
an
n
Warn a
b
out conflicting p4 bra
n
c
h
map
p
ings and use the
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-17
Simon Haus
m
ann
Fix t
h
e branc
h
mapping det
e
c
t
i
o
n to
be indepen
d
ent
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-16
Simo
n
Hausma
n
n
F
i
x i
n
itial multi-branch import
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-12
Sim
o
n Hausm
a
nn
Fix git-p
4
rebase to
detect
the correct upstream branch
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-12
Simon
H
ausmann
Moved th
e
co
d
e
f
rom git-p4 su
b
mit to
figure out
t
h
e
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-11
Si
m
on Hausm
a
nn
g
i
t-p4 sub
m
it: Fix missing quotes arou
n
d
p
4 comm
a
nds
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Simon Hau
s
m
a
n
n
Mention r
e
motes/p4/master also in the
d
o
cument
a
tion
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Simon Ha
u
smann
Provide
some informat
i
o
n
for s
i
ngl
e
br
a
nch imports
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Si
m
on H
a
usmann
Writ
e
out
t
he options
t
ag in the log
m
e
ssag
e
of import
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Simon Hausmann
Fix sup
p
o
r
t for explicit disabling of sync
i
ng with
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Simon Ha
u
smann
Fix depot-paths encodin
g
for multi-pat
h
i
m
ports (don
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
S
i
mo
n
Hausmann
Fix pr
o
je
c
t name guessing
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-10
Simo
n
H
ausm
a
nn
Fix
updating/cre
a
t
ing remotes/p4
/
*
heads from
o
rigin
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-09
Simon Hausmann
Fixed th
e
check to make sure to
e
xclu
d
e the HEAD
symbo
l
ic
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-08
S
imon Hausma
n
n
On
l
y g
e
t
the
expensive
br
a
nch
m
appin
g
from the p4 se
r
ver
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-07
Simon
H
ausmann
Make git-p4 submi
t
detect the
corr
e
c
t
r
e
f
e
r
e
n
ce
(
origin
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-07
Sim
o
n H
a
usmann
Make clone behav
e
like git clon
e
by default again
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
Fix depo
t
-path determination for
g
it-p4 submit
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Simon
H
ausmann
Fi
x
git-p
4
s
ubmit
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Simon Ha
u
smann
Fi
x
gi
t
-
p4 r
e
b
ase
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
Hack t
o
make t
h
e multi-branch
i
mport work again with
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
S
imo
n
Hausmann
D
on'
t
a
t
tempt to set
the initia
l
Parent
on m
u
lti-branch
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Simon
Hausmann
Fix common p
a
th "calculation" fro
m
l
o
gs o
f
multiple
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Simon Haus
m
ann
F
i
x
support for "de
p
ot-pa
t
h" in
o
lder git-p4 import
s
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-28
Simon H
a
usmann
Fix typo in li
s
tE
x
istingP4
B
ranch
e
s
t
hat bro
k
e sync
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-28
Simon Haus
m
ann
In *_pipe print the command that fa
i
led
i
f
i
t
f
a
il
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-28
S
imon Haus
m
a
n
n
Fix my e
m
ail ad
d
ress, this is
n
't re
a
ll
y
K
D
E related
:
)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-27
Simon Hausmann
Fix creation of refs
/
remo
t
e
s
/p
4
/HEAD s
y
mbol
i
c
ref
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-25
Simon Hausmann
Ad
d
ed git-p
4
submi
t
-
-t
r
ust-me-like-a-fool for the
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-25
S
i
mon Haus
m
ann
Forgot to re
m
ove th
i
s TODO
i
tem when I made --with
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-25
Simon H
a
usmann
Shortcut th
e
case where we have no origin branch
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-25
Simon Hausmann
M
ake
--with-origin the defaul
t
for syncing
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-25
Simon Hausmann
Make
-
-
w
i
th-origin also work w
i
t
h
out origin :)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-25
Sim
o
n Ha
u
sma
n
n
Make git-p4 work with packed ref
s
(don
'
t
use os
.
path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-25
S
i
m
on Hausman
n
Avoid creatin
g
non-p
4
branches in remotes/p4 off o
f
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
Simon Haus
m
ann
Oop
s
, f
i
x --with-o
r
i
gi
n
to /really/
a
lso call gi
t
fetch :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
S
imon Hausmann
A
d
ded support for --w
i
th-o
r
i
g
i
n with mul
t
i-br
a
nch i
m
ports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
Simon Hausmann
F
orgot to remove this
ret
u
rn
s
tatement
f
rom debugg
i
ng
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
S
i
m
on Ha
u
smann
Fix creating the remotes
/
p
4 branc
h
e
s bas
e
d
on or
i
gin
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
Simon Hausman
n
fast-im
p
ort:
F
ix c
r
ash when r
e
f
erencing already existing
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
Simon Hausmann
fast-import: Fix u
n
initialized v
a
riable
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-23
Sim
o
n
H
ausmann
Load the user map from p4 only
once at run-time
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-23
Simon
Ha
u
sma
n
n
Fix mult
i
-branch i
m
port with --s
i
lent
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Simon
Hausmann
F
i
x p4 exe
c
ution in git-p4 rol
l
back
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
S
i
m
on Hau
s
mann
Catch p4 errors in rol
l
back early enough (
b
efore dele
t
ing
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
S
imon
H
ausmann
Oops, fill the /li
s
t/ correct with the p4
e
xit code
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
S
imon Hausmann
Don't make len(p4Cmd("p
4
changes
-
m 1 //foo
/
.
.
.
"))
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausmann
Make rollb
a
ck work
w
it
h
locall
y
imported branches
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Simon
H
a
usmann
Av
o
id
c
alling git symbo
l
i
c
-ref r
e
fs/heads/p4//HEAD
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-22
Simon Hausmann
Doc updates
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-22
Simon Hausmann
Use refs/heads
/
* instead of refs/h
e
ads/p4
/
* for lo
c
a
l
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-22
Simon Hausmann
Added
support for --max-ch
a
nges=
<
count>
t
o ease i
m
por
t
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-22
Simon Hausmann
A
d
ded support for importing
m
u
l
tiple br
a
nches
i
nto
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Fixes fo
r
r
ol
l
ba
c
k, delete bran
c
h
e
s that d
i
d not
exist
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simo
n
Ha
u
smann
Fix
b
ranch de
t
ectio
n
in mu
l
ti-branch impo
r
ts
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Si
m
on Hausmann
Add
e
d a
rollback c
o
mmand for debugging
.
It
sets back
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon
Hausma
n
n
Make git-p4 submit --dir
e
ct s
a
fer by
also cr
e
ating
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Detect with gi
t
-p4 submit
-
-
direct wh
e
n
there are
n
o
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
S
i
mon Haus
m
ann
Fix
g
it symbolic-ref warning on
i
n
i
tia
l
clone
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simo
n
Hausmann
Fix
error de
t
ection wit
h
g
it-p
4
submit when the re
q
uested
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausm
a
nn
Fix conversion from old style heads/p4 to remotes/p4
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-20
S
imon Hausmann
Im
p
r
o
ve
d
output for multi branch imports
a
nd noted
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-20
Simon Hausmann
Another (poten
t
ially life-
s
avi
n
g
)
idea for submit
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-20
Simon Hausman
n
Had an id
e
a for debug
g
in
g
,
record it :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-20
S
i
mon Haus
m
an
n
Specif
y
ing --detect-branch
e
s is now only needed for
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-20
Simo
n
H
a
usmann
Added suppo
r
t fo
r
git-p4
submit --d
i
rect
(
experime
n
tal)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-20
Simon
H
au
s
mann
Use git f
o
rmat
-
pa
t
ch and git a
p
ply --apply when extracting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-20
Sim
o
n Hausma
n
n
Oops, not
o
n
ly /set/ gitdir
o
n clone, als
o
set it
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-20
Simon Hausmann
Fix gitdir not be
i
n
g
set when
c
lon
i
n
g
.
N
e
eded for w
r
i
t
ing
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-20
Simo
n
Hausmann
Cache the ou
t
put
of "p4 users" for fa
s
ter sy
n
cs on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
next