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
Give branches a nice project prefix and don't bail out on clone if we failed
2007-05-18
Simon Hausman
n
Give
branches a nice pro
j
ect pr
e
fix
a
n
d don't bail
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Sim
o
n Hausmann
S
t
arted rewritin
g
t
he
branch de
t
ection
,
based on "p4
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Simon
Ha
u
smann
Removed u
n
used cache variables
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-18
Si
m
on Ha
u
smann
Fix branch setup after init
i
al clone
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-17
Simo
n
Hausmann
R
emoved todo item
t
hat is implem
e
nted :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simo
n
Hausma
n
n
A
d
ded support for git-p4 sync/rebase --with-ori
g
i
n
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Bite the bullet and au
t
omatically
c
onvert
o
ld st
y
l
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon
H
aus
m
ann
Chan
g
ed the def
a
u
l
t p4 imp
o
rt
branch to be refs/rem
o
tes
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Create the orig
i
n based
i
mport branch u
s
i
n
g git update
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simo
n
Hausmann
Removed anc
i
ent and unused
c
o
de to f
i
nd
t
he
last
imp
o
rted
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Removed
c
lea
n
tags
c
ommand
.
I
t doesn't have any meaning
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausman
n
Clean u
p
code duplication
for revision
parsing and
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
A
lways p
a
ss a s
h
a1 for the
in
i
tia
l
pare
n
t so that git
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon
H
ausm
a
nn
Fixin
g
syncing (gitdir discov
e
ry / cd) for bare repositories
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-16
S
i
mon Hausmann
A little todo n
o
t
e
befor
e
I forget it :), bas
e
d on
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Sim
o
n H
a
usma
n
n
F
ix calling
g
it-p
4
rebase from within
a subdi
r
ectory
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simo
n
H
ausmann
G
i
ve a better hint
i
f
g
i
t-p4 s
u
bmit fa
i
ls
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon
Hausmann
Add
e
d
th
e
pos
s
i
bil
i
ty of
skipping pat
c
hes durin
g
git
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Sim
o
n H
a
u
s
m
ann
Make git-
p
4 wor
k
wi
t
h bare
repositories
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Fix
g
it-p4
clone //
d
e
pot/
p
rojec
t
(head
i
mport)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Mari
u
s
Storm-O
l
sen
Ma
k
e the command call s
i
lent
commit
|
commitdiff
|
tree
2007-05-15
S
i
mon Hausmann
C
o
nverted to
unix newlin
e
s
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Make s
u
bmit
t
ing work
o
n Windows
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon
Hausmann
Make sure all
p
open ca
l
ls us
e
bina
r
y mode (
f
or Window
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Added
a
little
.
ba
t
wrapper
f
r
o
m Marius
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Sim
o
n Hausmann
Use
t
he s
u
b
process module instead of popen2 to
m
ake
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
S
imo
n
Hausma
n
n
Doc
u
m
e
nt some
i
mplem
e
ntation details, f
o
r the c
u
ri
o
u
s
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Ha
u
smann
Cl
e
anup, removed the
o
l
d
tagging code
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
S
imon Hausmann
cleanu
p
, renamed self
.
gl
o
balPre
f
ix to s
e
lf
.
d
e
potPath
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
S
i
mon Hau
s
m
ann
Mic
r
o cleanup
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausm
a
nn
Doc c
l
ea
n
ups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hausmann
Handle
patch errors in git-p4 s
u
bmit better
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hausmann
A new
a
ttempt
a
t fixing
the child-fa
s
t-import-pro
c
ess
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Si
m
on Hausmann
Slig
h
tly
improved
f
ormatting of
t
h
e
r
aw_input quest
i
on
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausmann
R
emoved the old pa
t
ch app
l
y co
d
e
f
r
om
g
it
-
p4 submit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Haus
m
a
n
n
F
i
x th
e
timezone f
o
r
matting
.
Now qg
i
t al
s
o
d
isplays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Si
m
on Hausman
n
P
r
int an error message of some
s
ort if git f
a
st
-
import
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
S
i
mo
n
H
a
u
smann
Allow for
c
onvenient rebasing after git-p4 submit
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausm
a
nn
Added
a simple e
x
a
m
ple of us
a
ge
t
o
t
he "doc
u
m
entation
"
:)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Si
m
o
n
Hausma
n
n
fix variabl
e
usage (o
o
ps)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simo
n
Hausman
n
F
i
x file dete
r
mination for #h
e
ad impor
t
s
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon H
a
u
sma
n
n
A
d
d
ed git-p4 clone convenience command
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
Honor --silent for labels
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
S
imon
Ha
u
s
m
ann
T
urn off potentially
slow lab
e
l d
e
tec
t
ion by default
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausma
n
n
P
r
ovide
a tree su
m
mary af
t
er
g
it-p4 rebase
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausmann
Added git-p4 reba
s
e
conve
n
ience
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Simo
n
Hausmann
Cle
a
n up python clas
s
names
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Simon
H
ausmann
Fix "compilati
o
n" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon Hausm
a
nn
Fix
t
he docs f
o
r
git-p4 submit and turn git
-
p4 subm
i
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
S
i
mon H
a
usmann
Fix v
a
riable us
a
ge in
tag import
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simo
n
Hausman
n
Added sup
p
ort for mapping
p4 labels to
git
t
a
gs
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Si
m
on H
a
usm
a
nn
git
-
p4 d
e
bug doesn't need a
g
i
t
repositor
y
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simo
n
Hausma
n
n
Don't try to parse any options w
i
th git-p4 debug b
u
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
S
i
m
on Hausmann
P
r
efer gi
t
command over
git-command
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
S
imon Hau
s
mann
Min
o
r cosmet
i
c fixlet for the
git-p4
submit
s
ync question
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Si
m
on Hausma
n
n
Di
f
ferent vers
i
o
n
s of p
4
have
d
ifferent output for
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
U
s
e th
e
new increm
e
ntal import style by d
e
fault
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Si
m
on Hausmann
Make
it poss
i
ble to run git-p
4
submit from wi
t
hin the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simon
Hausmann
B
r
a
nd new smart incremental import
t
hat doesn't need
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
Hausmann
Set the default branch in run, no
t
in the const
r
ucto
r
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Si
m
on Hau
s
mann
H
e
lper
f
un
c
tion to check the existance
of
a revi
s
i
on
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Added some
helper functio
n
(s) to
parse the
d
epot path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausm
a
nn
Changed the defa
u
lt
b
r
a
nch for i
m
ports from
"
mas
t
er
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mo
n
Hausm
a
nn
Change
d
the format
o
f
the impor
t
ed log mes
s
age slightly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
R
e
m
o
ved the
.
py extensi
o
n
from g
i
t-p4 as it's annoying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
i
mon Haus
m
ann
D
o
n
't
sh
o
w the
submit template a
n
d t
h
e diff
f
irst in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Simon H
a
usmann
Make it possible to inv
o
ke
git
-
p4
from within subdi
r
e
c
tori
e
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausma
n
n
Made
-
-app
l
y-as-patch the
defau
l
t
f
o
r git-p4 s
u
bmit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Fix support
f
or
deletions
in
g
i
t
-p4 s
u
bmit w
h
en using
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hau
s
mann
Added
experimental bu
t
super-f
a
st --apply
-
as-patch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
S
i
mon Hausmann
Documen
t
ati
o
n
e
n
h
ancem
e
nts
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Si
m
on Hau
s
m
a
nn
Start of the git-p4 docu
m
entatio
n
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Ha
u
sma
n
n
Remo
v
ed p4-fast
-
export and
p4-git-sync as the
y
've been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
i
mo
n
Hau
s
mann
Fi
x
e
d
the initial v
e
r
s
ion i
m
p
ort by getting the file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simo
n
Hausma
n
n
Added missing "self"s
to
m
ake the script evaluate corr
e
c
tly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
C
o
mpletely
u
n
tested
"merge"
o
f p4-fast-export
.
py
in
t
o
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
sync
-
t
o-perfor
c
e is now
c
alled submit
and fi
x
e
d
the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon H
a
usmann
Part o
f
the code i
s
copyr
i
ght by Tro
l
l
tech ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
mon Hau
s
mann
First (u
n
teste
d
) attempt
a
t
migrating
p
4-g
i
t-sy
n
c
i
n
t
o
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon H
a
usman
n
Prov
i
de a little b
i
t of hel
p
description for th
e
git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simo
n
H
a
usmann
St
a
rt moving
the git-p4 tools into one sing
l
e script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simo
n
H
a
us
m
ann
P
a
ss the right
n
umber of arguments to c
o
mmit,
f
ixes
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausm
a
nn
Improved
the git
dir d
e
tection
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simon Hausmann
Defau
l
t to i
n
teract
i
ve s
y
nc
i
ng
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Si
m
on Hausman
n
Use p
4
revert
.
.
.
ins
t
ead of revert -a
.
.
.
after sub
m
itting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Aut
o
-detect the current
g
it branch before subm
i
tting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Ha
u
smann
Ignore Apple resourc
e
files w
h
en
importing fr
o
m
p
erforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Ha
u
s
m
ann
Be nice and use /usr/bin
/
en
v
python for the
git-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Sim
o
n
H
a
u
smann
Autom
a
t
i
c
ally operate on a temporary
b
ra
n
ch, needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
S
i
mon Hau
s
m
a
n
n
L
ots
of bugfixes t
o
p
4
-
g
it-s
y
n
c
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
S
im
o
n H
a
usmann
Fix
g
it-dir
option and allow
re
a
ding log
substitutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon Hausmann
First version of
a
n
ew
script to submit cha
n
ges b
a
ck
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
Hausmann
Split up the cac
h
e c
o
mmandl
i
ne options
i
nto (co
m
ma
n
d
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Reduce the n
u
mber of
f
a
lse "merges
"
by skipping "branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon H
a
usmann
More w
o
rk
on b
r
a
nch detec
t
i
o
n by i
m
plementing changeIsBr
a
nch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausm
a
nn
M
o
re code cleanups and prepar
a
tions for more b
r
anch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
Hausmann
Minor code
c
leanup
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
Hausmann
Make the
p
4 data/command ca
c
h
e configurable through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
H
ausmann
F
ixed
p
4-debug file extens
i
on
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausmann
Changed
-
-kno
w
n
-branche
s
to t
a
k
e
a fil
e
a
s argument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
next