From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Sep 2012 19:02:33 GMT
Subject: Re: [PATCH 04/21] git p4: fix error message when "describe -s" fails
Message-ID: <7vfw62klbx.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1348833865-6093-5-git-send-email-pw@padd.com>

Pete Wyckoff <pw@padd.com> writes:

> The output was a bit nonsensical, including a bare %d.  Fix it
> to make it easier to understand.
>
> Signed-off-by: Pete Wyckoff <pw@padd.com>
> ---
>  git-p4.py | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/git-p4.py b/git-p4.py
> index eef5c94..d7ee4b4 100755
> --- a/git-p4.py
> +++ b/git-p4.py
> @@ -2679,7 +2679,8 @@ class P4Sync(Command, P4UserMap):
>              if r.has_key('time'):
>                  newestTime = int(r['time'])
>          if newestTime is None:
> -            die("\"describe -s\" on newest change %d did not give a time")
> +            die("Output from \"describe -s\" on newest change %d did not give a time" %
> +                newestRevision)

Shouldn't it say "p4 describe -s"?

>          details["time"] = newestTime
>  
>          self.updateOptionDict(details)