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
Merge branch 'ph/pull-rebase-detached' into maint
2012-09-17
P
e
te Wyckof
f
g
i
t-p4: add
s
ubmit --c
o
nflic
t
option and config varaiable
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
P
ete Wyckoff
git
p
4: add submit --prepare-p4-o
n
ly optio
n
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete Wycko
f
f
git p4: add
s
ubmit --
d
ry-run
o
pti
o
n
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete
W
y
ckoff
git p4
:
accept -v for
-
-verbose
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
Pet
e
Wyckof
f
g
i
t p4: reve
r
t del
e
ted files after submit can
c
el
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete
W
yckoff
git p4: rearrange submit template construction
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete Wyckoff
git p4: test
clean-up after faile
d
s
u
bm
i
t, fix added
.
.
.
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
Pe
t
e Wyc
k
off
git p4: s
t
andar
d
ize s
u
bmit cancel
d
ue to unchanged
.
.
.
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
P
ete Wy
c
koff
git p4: mov
e
conflict
pro
m
p
t i
n
to ru
n
, add [q]ui
t
inp
u
t
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete Wyckoff
git p4: r
e
move
s
ub
m
it failu
r
e options
[a]pply and
.
.
.
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete Wyck
o
ff
git p4:
g
racef
u
l
ly f
a
il if some commits could
n
ot
b
e
.
.
.
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
P
e
te
W
yckoff
git p4
t
es
t
:
r
e
m
ove bash-ism
o
f c
o
m
bined export/assignmen
t
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-08-20
Pete Wy
c
koff
gi
t
p4: make branch detect
i
on wo
r
k
with --use-client
.
.
.
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-08-12
Pete Wyckoff
git p4
:
do wildcard decoding in stripRepoPa
t
h
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-08-12
P
e
t
e
W
yckoff
gi
t
p4: set
s
e
lf
.
branchPref
i
xes in initializa
t
io
n
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-08-12
Pete Wyc
k
o
f
f
git p
4
test
:
add broken --
u
se
-
client-spec
-
-detect
.
.
.
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-08-12
Pete Wycko
f
f
git
p
4 tes
t
:
mov
e
c
li
e
nt_vie
w
() func
t
ion
t
o library
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-07-06
Pete Wycko
f
f
git p4: notice Jobs lines in git commit
m
essages
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-07-06
P
ete Wyc
k
off
git p4 test
:
refactor marshal_dump
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-07-06
Pete Wycko
f
f
git p4: remove unused P4Submit intera
c
tiv
e
setting
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-06-28
Pete Wyckoff
gi
t
p4 t
e
st
:
fix badp4dir test
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-06-28
Pete
W
y
ckof
f
git p4 test:
split up big t
9
80
0
test
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-06-28
Pe
t
e
W
ycko
f
f
g
i
t p4 test: cleanup_git should m
a
ke a new
$
git
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-06-28
Pete Wyckoff
git p4 test: cop
y
s
ource inde
t
e
r
minate
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-06-28
P
e
te Wyckoff
git p4 test: ch
e
ck for error me
s
sage
i
n failed t
e
st
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-06-28
Pete Wyckoff
git p4 test: rename
s
ome "git-p4 command
"
string
s
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-06-28
P
ete
Wyck
o
ff
g
it
p
4 test:
n
ever crea
t
e
defa
u
lt te
s
t
r
epo
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-06-28
P
e
te
W
yckoff
git p4 test: simplify quoting
i
n
v
olv
i
ng TRA
S
H_DIR
E
CTORY
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-06-28
Pete Wyckoff
gi
t
p4 test: use re
a
l_path to resolve p4 clien
t
sy
m
link
s
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-06-28
Pete Wyckoff
git p4 test
:
w
ait longe
r
for
p
4
d
to
s
tart an
d
test
.
.
.
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-05-07
Pete Wyc
k
off
git p4 do
c
: fix
f
or
m
attin
g
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyc
k
off
git p4: s
u
bmit
fil
e
s with wil
d
cards
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wy
c
ko
f
f
g
i
t p4: fix wri
t
able
f
ile after rename o
r
c
opy
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
git p4: test
s
ub
m
it
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete
Wyc
k
off
git
p4: b
r
ing bac
k
fil
e
s in delet
e
d
c
lient di
r
ec
t
ory
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-04-30
P
e
te Wyckoff
remove
b
lank filename
in error message
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete
W
y
c
k
off
remove
superfl
u
ous n
e
wlines in error messa
g
es
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-04-24
Pete Wyckoff
git-r
e
mote-testgit: fix rac
e
when sp
a
wning fas
t
-import
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-04-10
Pe
t
e
Wyckoff
fas
t
-
i
mport: ti
g
hten parsing of dat
a
refs
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-04-09
Pete Wy
c
koff
git
p4
:
u
se
"
git p4" direct
l
y in
t
e
s
ts
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-04-09
Pete Wyckoff
git
p
4: u
p
date name in script
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-04-09
Pete Wyckoff
git-p4: move to to
p
level
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete
Wy
c
koff
git-p4:
r
emove bash-ism in
t
9800
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-02-27
P
e
te Wyc
k
off
gi
t
-p4: remove b
a
sh-ism in t9809
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete
Wyckoff
git-p4: fix submit re
g
ression with c
l
ientSpe
c
and
s
u
bdir
.
.
.
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wy
c
koff
git-p4: set us
e
C
l
i
entSp
e
c variable on
i
n
i
tial clon
e
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-01-26
P
e
te Wyckoff
gi
t
-p4: Change
p4 command invocation
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-01-12
P
ete Wyckoff
git-p4: a
d
d tests demonstr
a
ting spec overlay a
m
biguities
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-01-12
Pete Wyckoff
git-p4: a
d
just test to adhere
to stricter useClientSpec
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-01-12
Pe
t
e Wyckof
f
git-p4: c
l
a
r
ify
comment
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-01-12
Pete Wy
c
ko
f
f
git-
p
4: fix ver
b
ose comment typo
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-01-12
P
ete
W
yc
k
off
g
i
t-p4: only a sin
g
le
.
.
.
wildc
a
rd is su
p
ported
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-01-03
Pete
W
ycko
f
f
git
-
p4: view s
p
ec docu
m
entation
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-01-03
Pete Wyckoff
git-p4
:
rewrite view handling
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-01-03
P
e
te Wycko
f
f
git-p4: test clien
t
view
h
andli
n
g
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-12-27
P
ete Wyckof
f
git
-
p4: doc
u
ment and test submit opt
i
ons
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-12-27
Pe
t
e Wyckoff
git-p4:
t
est an
d
document --use-client
-
spec
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-12-27
Pete Wyckoff
git-p4:
test --keep-path
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-12-27
Pete Wyckoff
g
it-p4: te
s
t
-
-max-ch
a
nges
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-12-27
Pete Wyckoff
git-p4:
d
ocument
and test --i
m
port-loc
a
l
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-12-27
Pete Wyckof
f
gi
t
-p4: hono
r
--
c
hanges
f
ile option and test
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-12-27
P
e
te Wyckoff
git-p4: documen
t
and test clon
e
-
-
br
a
nch
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-12-27
P
e
te Wyckoff
git-p4: t
e
st cloning with tw
o
di
r
s
,
c
la
r
i
fy doc
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-12-27
Pe
t
e Wyckoff
git-
p
4: clone does not use --git
-
dir
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-12-27
P
e
te Wyckoff
gi
t
-p4: introduce a
s
ciidoc documentation
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-12-27
Pete W
y
ckoff
rename
g
it-p4 tests
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-12-18
Pete
W
y
c
koff
git-p4: fix s
k
ipSu
b
m
i
tE
d
it regression
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-12-12
Pete
Wyckoff
git-p4: test for
absolute PWD problem
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-12-12
P
ete Wyckoff
git
-
p4: submi
t
test for au
t
o
-
c
reat
i
ng clientPath
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-12-05
Pete Wyckof
f
git-p4:
introduce skip
S
ubmitEdit
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-11-06
Pete Wyckoff
git-p4: ignore ap
p
le
f
iletype
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-10-18
Pet
e
Wyckoff
g
i
t-p4: s
t
op ignori
n
g apple f
i
let
y
pe
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-10-18
Pete Wyckoff
g
i
t-p4:
recogn
i
ze all
p4 filetypes
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-10-18
Pete Wyckoff
git-p4: keyword flattening
fixes
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-10-18
Pete Wyckoff
g
it
-
p4: handle utf
1
6
f
iletype
p
r
operly
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-10-18
P
e
te Wyck
o
f
f
g
i
t-
p
4 tests: refactor an
d
cle
a
nup
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-08-29
P
ete Wy
c
koff
gi
t
-p4: simple branch tes
t
s edits
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-08-01
Pete
Wyckoff
git-p
4
: commit time
s
hould be most recent p4 change
.
.
.
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-08-01
P
e
te Wyc
k
off
git
-
p4: on
e
test missing config git-
p
4
.
skipSubmit
E
ditCheck
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-08-01
P
e
te Wyckoff
git-p4: add missing && in test
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-08-01
Pe
t
e Wyckof
f
git-
p
4: us
e
t
e
s
t
_wh
e
n_finish
e
d
in tests
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-03-16
Pete Wy
c
ko
f
f
git
-
p4: test syn
c
ne
w
branch
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-03-16
Pet
e
W
ycko
f
f
gi
t
-p4:
f
ix sync new b
r
anch regression
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-03-13
Pete Wyck
o
f
f
git-p4: test cl
o
n
e @all
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-03-13
Pete Wyckoff
git-p4: fix
c
l
o
ne @all regression
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-02-21
P
ete Wyckoff
gi
t
-p4: support
c
lone --
b
are
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-02-21
Pete Wycko
f
f
gi
t
-
p
4: decode p4 wildcard characters
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-02-21
Pete Wy
c
k
off
git-p4: better message
for "git-p4 sy
n
c" when
not cl
o
ned
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-02-21
P
e
te Wyckoff
git-p4
:
reinterpret co
n
fusi
n
g
p4 message
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-02-21
Pete Wyckoff
git
-
p
4
: accom
m
oda
t
e
n
e
w m
o
ve
/
d
e
l
ete type in p4
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-02-21
Pete Wyck
o
ff
git-p4:
a
d
d missin
g
n
ewline in
in
i
tia
l
im
p
o
rt message
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-02-21
Pete Wyckoff
git-p4: fix key error f
o
r
p4 p
r
ob
l
em
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2011-02-21
Pete Wy
c
k
o
ff
git-p
4
: test
s
c
r
ipt
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2010-12-22
Pete
W
yckoff
conv
e
r
t
f
ilter:
supply pat
h
to
e
x
t
e
r
n
al driver
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2009-03-08
Pete
Wyckof
f
git
-
p4: remov
e
tab
s
from usermap
f
ile
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2009-02-23
Pete Wyckoff
gi
t
-p4: avoid synci
n
g
dupl
i
ca
t
e changes
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2008-11-27
Pete Wyckoff
git-p4: fix keyword-expansi
o
n regex
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree