Merge branch 'maint'
* maint: git-svn: don't attempt to spawn pager if we don't want one Supplant the "while case ... break ;; esac" idiom User Manual: add a chapter for submodules user-manual: don't assume refs are stored under .git/refs Detect exec bit in more cases. Conjugate "search" correctly in the git-prune-packed man page. Move the paragraph specifying where the .idx and .pack files should be Documentation/git-lost-found.txt: drop unnecessarily duplicated name.
This commit is contained in:
@ -63,6 +63,14 @@ def system(cmd):
|
||||
if os.system(cmd) != 0:
|
||||
die("command failed: %s" % cmd)
|
||||
|
||||
def isP4Exec(kind):
|
||||
"""Determine if a Perforce 'kind' should have execute permission
|
||||
|
||||
'p4 help filetypes' gives a list of the types. If it starts with 'x',
|
||||
or x follows one of a few letters. Otherwise, if there is an 'x' after
|
||||
a plus sign, it is also executable"""
|
||||
return (re.search(r"(^[cku]?x)|\+.*x", kind) != None)
|
||||
|
||||
def p4CmdList(cmd, stdin=None, stdin_mode='w+b'):
|
||||
cmd = "p4 -G %s" % cmd
|
||||
if verbose:
|
||||
@ -932,7 +940,7 @@ class P4Sync(Command):
|
||||
data = file['data']
|
||||
|
||||
mode = "644"
|
||||
if file["type"].startswith("x"):
|
||||
if isP4Exec(file["type"]):
|
||||
mode = "755"
|
||||
elif file["type"] == "symlink":
|
||||
mode = "120000"
|
||||
|
Reference in New Issue
Block a user