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
bisect: remove "checkout_done" variable used when checking merge bases
2008-08-27
Simon
H
a
usmann
M
a
k
e it pos
s
ible to abort the
submission of a ch
a
nge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-08-24
S
imon
H
ausm
a
nn
Clean up the
git-p4
documentation
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-03-04
Simon
Hausma
n
n
g
i
t
-
p4: Fi
x
i
mport of chan
g
esets
w
ith file
d
e
le
t
ions
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
Simon
H
a
u
sman
n
g
i
t-p
4
: git
-
p4 submit cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
Simon Hausmann
git-p4: Re
m
oved git-p4 submit
--d
i
rect
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
Simon Hausma
n
n
git-p4:
C
lean
u
p g
i
t
-p4 submi
t
's log me
s
sage handlin
g
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-27
S
i
m
o
n Hausma
n
n
git-
p
4: Rem
o
ve -
-
log-substitutions feature
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-03
Simon Hausmann
git-p4: Ensu
r
e the wor
k
ing directory and the index
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2008-02-03
S
i
m
o
n H
a
u
s
mann
git-p4:
Fix submit
u
ser-in
t
erface
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-11-16
Simo
n
Hausman
n
git-p4: Fix dire
c
t
import from
p
erforce after fetching
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-10-20
S
i
mon Hausmann
git-p4: When skipping a patch as
part of "git-p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon Hausm
a
nn
git-p4:
Added sup
p
or
t
for automat
i
c
a
lly impor
t
i
n
g
newly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon Hausmann
gi
t
-p4:
C
lean
u
p; move
d
t
he (dupl
i
cated) code f
o
r turni
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Sim
o
n
H
ausmann
git-
p
4:
C
leanup; m
o
v
e
d the code for th
e
ini
t
ia
l
#h
e
ad
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon Hausmann
git-p4
:
C
leanup; Turn s
e
lf
.
revision
i
nto a f
u
n
c
tion
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Si
m
on Hausmann
g
it-p
4
: C
l
e
a
nu
p
; mov
e
d the
c
ode
to import a li
s
t
o
f
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Sim
o
n
H
ausma
n
n
g
i
t-p4: Cle
a
n
u
p;
m
o
v
ed the
c
ode for getting a sorte
d
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon Hausman
n
git-p4: After submission to p4 always synchronize fro
m
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-09-03
Simon Hausm
a
nn
git-p4: Always
c
all 'p4 sync
.
.
.
' bef
o
re
submitting
.
.
.
commit
|
commitdiff
|
tree
2007-08-25
Simon Hausmann
git-p4: Fix warnings about non-
e
xis
t
ant re
f
s
/remote
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-08-25
Simo
n
H
a
u
smann
g
it-p4:
M
a
ke 'git-p4
b
ranch
e
s' work after an in
i
ti
a
l
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-08-08
Simo
n
Ha
u
s
mann
git-p4: Fix git
-
p4
submi
t
to
i
ncl
u
de on
l
y
c
hanged files
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-08-08
Simon Hausmann
git-p
4
: Fix s
u
pport for symlinks
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-07-25
S
i
m
o
n Hau
s
mann
git-p4:
Fix p4 user cache po
p
ulation on Windows
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-07-18
Sim
o
n Hausma
n
n
git-
p
4: Cle
a
n
u
p, used common function f
o
r list
i
ng im
p
orted
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-07-18
Simon
H
ausmann
git-p4: Fix upstream branch detectio
n
f
o
r submit
/
rebase
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-07-18
Simon Hausma
n
n
git-p4: Cl
e
anup,
make listExis
t
i
n
gP4B
r
anches a glob
a
l
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-27
S
imon Hausmann
git-new-wor
k
dir: Fix shell wa
r
n
i
n
g about operator
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-21
Si
m
on Hausmann
Make it possible to s
p
ecify th
e
HEAD fo
r
the interna
l
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-20
S
imon
H
a
usman
n
Added
g
i
t-p4 bra
n
ches command t
h
at shows
t
he
m
apping
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-17
Simon Hausmann
Warn about
conflicting p4 branch map
p
i
n
g
s
a
nd use the
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-17
Simon Hau
s
m
a
nn
Fix the bra
n
ch mapp
i
ng detection
to be ind
e
pe
n
dent
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-16
Sim
o
n Haus
m
ann
Fix in
i
tial mult
i
-bra
n
ch import
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-12
Simon Haus
m
ann
Fi
x
git-p4 re
b
a
se to detec
t
the corre
c
t up
s
tream branc
h
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-12
Simon Hausmann
Moved the code from git-p4 submit to figur
e
out the
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-11
Simon Hausmann
git-p4
submit: Fix missing
q
u
o
tes around p4
comman
d
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
S
i
m
on Hausm
a
nn
Mention remotes/p4/master also
in the doc
u
mentation
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Simon H
a
usmann
P
r
ovide so
m
e
in
f
ormation for single bran
c
h imports
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Simo
n
Hausma
n
n
Write ou
t
the options tag in the log mes
s
age
o
f
imp
o
rts
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Si
m
on
Hausmann
F
i
x support for explicit
d
is
a
bling of syncing
with
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Simon Hausmann
Fi
x
d
e
pot-paths encoding for multi-path imports (d
o
n
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-11
Simon H
a
usm
a
n
n
F
i
x project name guessing
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-10
Simon Hausmann
F
i
x
updat
i
n
g
/
creating remotes/p
4
/* hea
d
s from orig
i
n
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-09
Simon
H
a
usmann
Fixed
t
he che
c
k to
m
ake sure to
exclude the HEAD symbolic
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-08
Simon Hausmann
O
n
l
y
get
the expensive branch mappin
g
from the
p
4
s
erve
r
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-07
Simon Haus
m
ann
Make git
-
p4 submit det
e
c
t the correct r
e
f
ere
n
ce (
o
rigin
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-07
Simon Haus
m
a
nn
Mak
e
c
l
o
n
e behave like git clone by defau
l
t
a
gain
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-06-07
Simo
n
Hausmann
Fix depo
t
-
path de
t
erminati
o
n
f
o
r
git-p4 submit
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
Fix gi
t
-p4 submi
t
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
S
i
mon Hausma
n
n
F
ix git-p4 rebase
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Simon
H
ausman
n
H
a
ck to make t
h
e multi-branch
impo
r
t work again with
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
S
imon Hausman
n
Don't
attempt to set the i
n
itial
P
arent on multi-
b
ranch
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
F
ix
common path "ca
l
cul
a
ti
o
n" fr
o
m logs of multiple
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-06-07
S
imon
Hausmann
F
i
x sup
p
ort
f
or "
d
epot-p
a
t
h"
i
n
olde
r
git
-
p4
i
m
port
s
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-28
Simon Hausm
a
nn
Fix ty
p
o
i
n listExistingP4Br
a
nches that broke sync
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-28
Simon Hausmann
In
*
_pipe print the com
m
and that failed
i
f
i
t
fails
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-28
Simon Hausman
n
Fix my email
address, this isn't reall
y
KDE related :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-27
Simon Hausmann
F
ix cre
a
ti
o
n of refs/remotes/p4/HEAD s
y
m
b
o
l
ic
r
ef
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-25
Simon Hausmann
Added git-p4 submit --tru
s
t-m
e
-
l
ike-a-
f
ool fo
r
t
h
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-25
Simon
Hausm
a
nn
Forgot
to r
e
move this TOD
O
item when I
made --w
i
t
h
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-25
Simon Hausman
n
S
h
ortc
u
t the
case w
h
ere we hav
e
no origin branch
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-25
Simo
n
Hau
s
mann
Make --wit
h
-origi
n
the def
a
ult for syncing
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-25
Simon Hausma
n
n
M
ake --with-origin also w
o
rk without origin :)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-25
Simo
n
H
ausmann
M
a
k
e
git-p4 work
with pa
c
ked refs (don't use os
.
path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-25
Simon Hausman
n
A
void
c
rea
t
ing
non-p4
b
r
a
nches in remotes/p4 off
of
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
Simon Hausman
n
Oops, fix --with-ori
g
i
n
to
/
really/ also call git
f
etch :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
S
i
mon H
a
usmann
Added support for --with
-
origin with mult
i
-branch im
p
orts
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
Simon Haus
m
ann
Forg
o
t
t
o
r
emove th
i
s r
e
t
urn s
t
atement
from debug
g
ing
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
Si
m
on Hausmann
Fix creating the r
e
mo
t
es/p4 branches b
a
sed on origin
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
S
imon Hausmann
fast-import: Fix crash when referencing a
l
r
e
ady existing
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-24
Sim
o
n Ha
u
s
m
ann
fast-im
p
ort: Fix uniniti
a
l
ized variable
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-23
S
i
mon Hausmann
Load the user map from p4 only once a
t
ru
n
-ti
m
e
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-23
Simon
Hausmann
Fix
mult
i
-
b
ranch import with
--sil
e
nt
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausmann
Fi
x
p4 execution in
git-p4
rol
l
back
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
S
i
mo
n
Hausmann
Catch
p
4 err
o
rs in rol
l
back
e
arly enough (befo
r
e deleting
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Simon Ha
u
s
man
n
Oops, fill the
/
l
ist/ c
o
r
rect with the p4
exit code
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Sim
o
n Haus
m
an
n
Don't ma
k
e len(p4Cmd("p4 c
h
anges -m 1 //foo/
.
.
.
"))
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausmann
M
a
ke ro
l
l
b
ack work
w
i
t
h locally importe
d
branches
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-23
Si
m
o
n
Haus
m
ann
A
v
oid calling git s
y
mbolic-ref refs/heads/p4//HE
A
D
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-22
Simon Hausman
n
Doc updates
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-22
S
imon Hausmann
Use r
e
fs/heads/* instead of
refs
/
heads
/
p4/*
for local
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-22
Simo
n
H
au
s
man
n
Adde
d
su
p
port for --m
a
x-cha
n
ges=<count> to ease i
m
port
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-22
S
i
mon Hausmann
A
d
d
ed support for importing multip
l
e branches into
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon
Hausmann
Fi
x
e
s
for ro
l
l
b
ack, delete branches that did not exist
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausma
n
n
Fix branch det
e
c
tio
n
in multi-branch
im
p
orts
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Added a rollback
c
ommand f
o
r deb
u
gging
.
It sets back
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Make gi
t
-p4 submit
-
-direct safer by also
c
reating
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
De
t
ec
t
with git-p4 submit --direct when
th
e
re are
n
o
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausman
n
Fix
g
it symboli
c
-
r
ef warning
on
in
i
tial clone
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Fix e
r
ror det
e
ction with git-p4 submit when the
r
equested
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
F
i
x
conver
s
io
n
f
rom old style
heads/p
4
to remotes/p4
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-20
Simo
n
Ha
u
smann
I
m
p
ro
v
ed outp
u
t
f
or multi branch
i
mports and noted
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-20
S
i
mon
H
ausmann
Another (potentially life
-
saving) idea
fo
r
submit
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-20
Simon Hausmann
Had an idea for debugging, record it :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-20
Simon Hau
s
mann
Specifying --de
t
ect-bran
c
hes
is now onl
y
needed for
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-20
S
i
m
on Hausma
n
n
A
d
ded su
p
port for git-p4
s
u
b
mit --direct (exp
e
rimental)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-20
Si
m
on H
a
u
s
mann
Use git format-patc
h
a
nd gi
t
appl
y
--apply whe
n
e
xtr
a
cting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-20
Simon Hausma
n
n
Oops, no
t
only /set/ g
i
tdir on clone, a
l
so set
it
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-20
S
i
mon Hausmann
Fix gitdir not bei
n
g set when cloning
.
Needed for writin
g
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-20
Si
m
o
n Haus
m
ann
Cache
the output of
"p4 users" for faster syncs
o
n
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
next