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 'maint-1.8.5' into maint-1.9
2014-01-22
Pete Wyckoff
git p
4
doc: use two-line style for
o
ptions with
m
ult
i
ple
.
.
.
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2014-01-22
Pete W
y
ckoff
git p4
t
est: e
x
amine behavior with locked (+l) files
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2014-01-22
Pete
W
yc
k
off
git
p
4: f
i
x
a
n error
message when "p4 where" fails
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2014-01-22
Pet
e
Wyckoff
git
p4: handle
f
i
les with wildc
a
rds
w
hen doing RCS
.
.
.
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2014-01-22
Pete Wy
c
k
off
git p4 test: do not pollute /tmp
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2014-01-22
Pete Wyckoff
gi
t
p4
test: run as
use
r
"
a
u
t
hor"
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2014-01-22
Pe
t
e Wyc
k
off
git p4 test
:
is_cli_
f
i
le_writeabl
e
succ
e
eds
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2014-01-22
P
e
te Wyckoff
gi
t
p4 test
:
explicit
l
y
c
heck p4
wildcard delete
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2014-01-22
Pete
W
y
c
k
o
f
f
gi
t
p4: work ar
o
und
p4
bug that c
a
uses e
m
pty symlink
s
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2014-01-21
Pe
t
e Wyckoff
git p4 test: ensure p
4
symlink parsing works
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2014-01-21
Pet
e
Wyckoff
git p4 tes
t
: wildcards
a
re
s
upported
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-03-11
Pete
Wyckoff
g
it p4 t
e
st: should honor s
y
mlink in p
4
client root
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-03-08
Pete Wyckoff
git p4
test:
m
ake sure P4C
O
N
F
IG relati
v
e pat
h
wo
r
ks
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4: introduce
gi
t
ConfigBool
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
g
i
t
p4: avoid sh
e
ll when call
i
ng git config
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-27
P
e
te Wyc
k
off
g
i
t p4: a
v
o
id shell when
i
nvoking gi
t
config --g
e
t-a
l
l
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-27
Pe
t
e
Wyckoff
git p4
:
avoid shell when invok
i
ng git rev-l
i
st
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete
W
yckoff
git
p
4: avoid
s
hell when mapping us
e
rs
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-27
P
e
te W
y
ckoff
g
it p4
:
disable read-only at
t
ribute befo
r
e
d
eleting
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
g
i
t p4 test: use test_chmod
f
or cygwin
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyc
k
o
ff
git p4: cygw
i
n
p4
client do
e
s not mar
k
read
-
only
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-27
Pe
t
e Wyckoff
git p4 test: avoid wildca
r
d *
i
n windows
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete W
y
ckoff
git p4 test: use L
i
neEnd unix in windows te
s
ts too
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-27
P
ete
W
yckoff
git p4 t
e
st: newline
h
a
n
dling
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
g
i
t p4: s
c
r
ub crlf fo
r
utf16 files
o
n wind
o
ws
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete W
y
c
kof
f
g
i
t p4:
r
emo
v
e un
r
eachable windows \r\n conversio
n
.
.
.
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyckoff
git p4 test: translate windows
pa
t
hs for cygwin
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete Wyc
k
off
git p4
t
e
st: start p4d inside it
s
db d
i
r
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-27
Pe
t
e
Wyck
o
ff
g
i
t p4 test: us
e
client_view
i
n t9806
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-27
Pe
t
e
Wyckoff
git p4 test
:
avoid lo
o
p in c
l
i
e
nt_view
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-27
Pete
Wyckoff
git p4 t
e
st: u
s
e cli
e
nt_vi
e
w
to buil
d
the i
n
itial
c
lient
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-27
Pet
e
W
yckoff
gi
t
p
4
: generate b
e
tter
error message for bad depot
.
.
.
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-27
P
ete Wyckoff
g
i
t
p
4: remov
e
unused im
p
orts
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-27
Pet
e
Wyckoff
g
i
t
p4: temp branch
n
ame sh
o
u
ld use
/
even on
w
indow
s
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete Wyckoff
g
i
t p4:
fix su
b
m
i
t wh
e
n no
m
as
t
er br
a
nch
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-15
Pe
t
e Wyc
k
off
git p4 test: kee
p
P4
C
LI
E
NT
c
hanges inside subshells
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete Wyc
k
of
f
git p
4
: fix sync --
b
ranch when n
o
maste
r
branch
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-15
Pet
e
Wyckoff
g
it
p
4: fail graceful
l
y on sy
n
c wit
h
no master bran
c
h
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete
Wyckoff
git p4: rearrang
e
s
e
lf
.
i
n
itialParent use
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete Wyckoff
git p4:
a
llow short
re
f
names to --
b
ra
n
c
h
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete
Wyckoff
g
i
t
p
4 doc: fix branc
h
detecti
o
n exampl
e
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete Wyckof
f
git p4: clone
--
b
ranch
shoul
d
checkout ma
s
ter
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-15
Pe
t
e Wycko
f
f
git
p
4: verify expected refs in clone --bare test
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete Wyckoff
g
it
p4:
cr
e
ate p4/HEAD
on initial clo
n
e
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-15
Pe
t
e Wyckoff
git p4: inline listExi
s
tingP4Git
B
ranches
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete Wyckoff
git p4: a
d
d comm
e
n
ts
t
o p4B
r
anchesInGit
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete Wyckof
f
git p4: rearrange and simplify
h
a
s
O
rigin
h
andling
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2013-01-15
Pete Wyckoff
git p4: test
s
ync/clone --bra
n
ch behavio
r
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-11-26
Pete
W
y
ckoff
git p4: remove unneeded c
m
d init
i
alization
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-11-26
Pete Wyc
k
off
git p4: fix
labelDe
t
ai
l
s typo in exception
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-11-26
Pete Wyckoff
git p4 te
s
t: displa
y
unre
s
olvable host err
o
r
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-11-26
Pete Wyckoff
g
i
t p4: ca
t
ch p4 errors when streaming file cont
e
nts
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-11-26
Pete Wy
c
k
o
f
f
git p4: handl
e
se
r
vers
with
o
u
t move support
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-11-26
Pete Wyckoff
g
it p4:
catch p
4
d
escri
b
e
errors
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-11-08
Pe
t
e Wyckoff
g
i
t
p
4: RCS expansion
should n
o
t
s
pan ne
w
lines
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete Wyckoff
g
i
t-p4: add s
u
bmit --conflict
o
ption
a
n
d
c
onfig vara
i
ab
l
e
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete Wyckoff
git p4: add submit
--pre
p
are-p4-only
opt
i
on
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete Wyckof
f
g
i
t p4: add sub
m
it
-
-
d
ry-
r
un option
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
P
ete Wycko
f
f
git p4:
accep
t
-
v for --verbose
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
Pet
e
Wyckoff
git p4:
r
evert
d
elet
e
d
files after
subm
i
t cancel
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
P
e
te Wyckoff
git p4: rearrang
e
s
ubmit templa
t
e
construction
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete Wyck
o
ff
gi
t
p4: t
e
st cle
a
n-up
after faile
d
submit, fix
a
d
ded
.
.
.
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete
Wyc
k
o
f
f
g
it p4
:
standard
i
z
e
submit cance
l
due to un
c
hanged
.
.
.
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete Wyckof
f
git p4: move
conflic
t
prompt
i
nto run,
add [q]uit input
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete Wyckoff
g
i
t
p4:
remove submit failure
o
ptions [a]pply and
.
.
.
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete Wyckoff
git p4: grac
e
f
u
l
l
y
fail if some c
o
m
m
its could not be
.
.
.
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete
W
yckoff
git
p4
t
e
st: remo
v
e
bash-is
m
of co
m
bin
e
d export
/
assignment
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-08-20
Pete W
y
ck
o
ff
g
it
p4:
make branch detection work with --use-client
.
.
.
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-08-12
Pet
e
Wyckoff
g
i
t
p4:
d
o wildcard de
c
o
d
ing
i
n stripRepoPat
h
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-08-12
P
ete Wycko
f
f
g
i
t
p
4
: set
self
.
branchPrefixes in initialization
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-08-12
Pete Wyckoff
git p4 te
s
t: add br
o
ken -
-
us
e
-client-
s
pec --detect
.
.
.
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-08-12
Pet
e
W
y
ckoff
git
p
4 test: move client_view() f
u
ncti
o
n to libr
a
ry
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-07-06
P
e
te
W
yckoff
git
p4
:
no
t
ice
Jobs l
i
nes in git commit mess
a
g
e
s
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-07-06
Pete Wyck
o
ff
g
it p4 test: refa
c
to
r
mars
h
al_
d
ump
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-07-06
P
e
te Wyckof
f
git p4: remove unu
s
ed P4Submit
intera
c
tive
s
etting
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-06-28
Pete Wyckoff
git p4 test:
f
ix badp4d
i
r test
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-06-28
Pete Wyckoff
git p4 test: split up bi
g
t9800 te
s
t
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-06-28
Pet
e
Wyckof
f
git p4
t
es
t
: cleanup_git shou
l
d make a
n
ew $git
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-06-28
P
ete Wyckoff
gi
t
p
4
test
:
copy sourc
e
indeter
m
inate
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-06-28
Pet
e
Wyckoff
g
i
t
p4
t
es
t
: check fo
r
error message in failed test
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-06-28
Pe
t
e Wyckoff
git p4 test: rename some
"g
i
t
-
p4 command" strings
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-06-28
Pete Wyckoff
git p4 t
e
st
:
never create d
e
fault
t
est repo
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-06-28
Pete Wyckoff
git p4 test:
s
im
p
lify quo
t
ing in
v
olving
T
RASH_DIRECTORY
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-06-28
Pete Wyckoff
git p4 test: use
r
e
al_path to resolve p
4
client symlinks
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-06-28
P
e
te
W
y
ckoff
git p4
t
est: wait longer for p4d to s
t
art and
t
est
.
.
.
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-05-07
Pete Wyc
k
o
f
f
git p4 doc
:
fix forma
t
ting
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-04-30
Pe
t
e
W
yc
k
o
f
f
git p4: submit files w
i
t
h
wil
d
cards
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-04-30
Pet
e
Wyckof
f
gi
t
p4:
f
ix wr
i
t
a
ble file
after
rename or copy
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
git p4: test submit
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
gi
t
p
4: bring b
a
c
k
files in deleted
c
lient di
r
ectory
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-04-30
P
e
te Wyckoff
remove blank filename in err
o
r me
s
sage
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wycko
f
f
remov
e
superfluous
newlines in error
messages
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-04-24
P
e
te Wyckoff
git-remote-testg
i
t
: fix race wh
e
n spawning fa
s
t
-i
m
port
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-04-10
Pete
W
yckoff
fast-import: ti
g
hten par
s
ing of
datarefs
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-04-09
Pet
e
Wyckoff
git p4: use
"
g
i
t p
4
" di
r
ectly in tes
t
s
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-04-09
Pete W
y
ckoff
g
it p4: upd
a
t
e name
in
s
c
ri
p
t
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-04-09
Pete Wyckoff
g
it-p4: move
t
o toplevel
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wycko
f
f
gi
t
-p4: remove ba
s
h-ism in t9800
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyckoff
git-p4: r
e
move bash
-
ism in t9809
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
2012-02-27
Pe
t
e Wyckoff
git-p4:
f
ix submit r
e
g
r
ession with c
l
ie
n
tSpec and
s
u
b
dir
.
.
.
Signed-off-by:
Pete Wyckoff
<pw@padd.com>
commit
|
commitdiff
|
tree
next