From: Junio C Hamano Date: Thu, 11 Jun 2015 16:29:55 +0000 (-0700) Subject: Merge branch 'mt/p4-depotFile-at-version' X-Git-Tag: v2.5.0-rc0~46 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8f436d1374c7b8bd29118bd6344520dbaf83594b?ds=inline;hp=-c Merge branch 'mt/p4-depotFile-at-version' * mt/p4-depotFile-at-version: p4: retrieve the right revision of the file in UTF-16 codepath --- 8f436d1374c7b8bd29118bd6344520dbaf83594b diff --combined git-p4.py index ca6bb95c57,d0df1d92e0..26ad4bcf77 --- a/git-p4.py +++ b/git-p4.py @@@ -1248,7 -1248,7 +1248,7 @@@ class P4Submit(Command, P4UserMap) editor = os.environ.get("P4EDITOR") else: editor = read_pipe("git var GIT_EDITOR").strip() - system([editor, template_file]) + system(["sh", "-c", ('%s "$@"' % editor), editor, template_file]) # If the file was not saved, prompt to see if this patch should # be skipped. But skip this verification step if configured so. @@@ -2145,7 -2145,7 +2145,7 @@@ class P4Sync(Command, P4UserMap) # them back too. This is not needed to the cygwin windows version, # just the native "NT" type. # - text = p4_read_pipe(['print', '-q', '-o', '-', file['depotFile']]) + text = p4_read_pipe(['print', '-q', '-o', '-', "%s@%s" % (file['depotFile'], file['change']) ]) if p4_version_string().find("/NT") >= 0: text = text.replace("\r\n", "\n") contents = [ text ]