From: Pete Wyckoff <pw@padd.com>
To: Tor Arvid Lund <torarvid@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git-p4: Fix error message crash in P4Sync.commit.
Date: Fri, 11 Feb 2011 05:44:43 -0800 [thread overview]
Message-ID: <20110211134443.GA11773@honk.padd.com> (raw)
In-Reply-To: <1297167610-1795-1-git-send-email-torarvid@gmail.com>
torarvid@gmail.com wrote on Tue, 08 Feb 2011 13:20 +0100:
> There is an error message that crashes the script because of an invalid ref
> to the non-existing "path" variable. It is almost never printed, which
> would explain why nobody encountered this problem before... But anyway,
> this oneliner fixes it.
Needs signoff.
Acked-by: Pete Wyckoff <pw@padd.com>
> ---
> contrib/fast-import/git-p4 | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
> index ca3cea0..29b9e32 100755
> --- a/contrib/fast-import/git-p4
> +++ b/contrib/fast-import/git-p4
> @@ -1086,7 +1086,7 @@ class P4Sync(Command):
> if [p for p in branchPrefixes if p4PathStartsWith(f['path'], p)]:
> new_files.append (f)
> else:
> - sys.stderr.write("Ignoring file outside of prefix: %s\n" % path)
> + sys.stderr.write("Ignoring file outside of prefix: %s\n" % f['path'])
>
> self.gitStream.write("commit %s\n" % branch)
> # gitStream.write("mark :%s\n" % details["change"])
> --
> 1.7.3.1.68.g06779.dirty
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
prev parent reply other threads:[~2011-02-11 13:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-08 12:20 [PATCH] git-p4: Fix error message crash in P4Sync.commit Tor Arvid Lund
2011-02-11 13:44 ` Pete Wyckoff [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110211134443.GA11773@honk.padd.com \
--to=pw@padd.com \
--cc=git@vger.kernel.org \
--cc=torarvid@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).