git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Git List" <git@vger.kernel.org>, "René Scharfe" <l.s.r@web.de>
Subject: Re: [PATCH] mailinfo: support format=flowed
Date: Tue, 4 Sep 2018 16:25:42 -0700	[thread overview]
Message-ID: <20180904232542.GC34268@aiede.svl.corp.google.com> (raw)
In-Reply-To: <20180904231959.GB34268@aiede.svl.corp.google.com>

Jonathan Nieder wrote:
> René Scharfe wrote:

>>  builtin/am.c                |    4 +
>>  mailinfo.c                  |   64 +-
>>  mailinfo.h                  |    2 +
>>  t/t4256-am-format-flowed.sh |   19 +
>>  t/t4256/1/mailinfo.c        | 1245 +++++++++++++++++++++++++++++++++++
>>  t/t4256/1/mailinfo.c.orig   | 1185 +++++++++++++++++++++++++++++++++
>
> This mailinfo.c.orig file appears to have been lost when applying the
> patch to git.git, resulting in test failures:
>
>  $ ./t4256-am-format-flowed.sh -v -i
>  Initialized empty Git repository in git/t/trash directory.t4256-am-format-flowed/.git/
>  expecting success: 
>         cp "$TEST_DIRECTORY/t4256/1/mailinfo.c.orig" mailinfo.c &&
>         git add mailinfo.c &&
>         git commit -m initial
>
>  cp: cannot stat 'git/t/t4256/1/mailinfo.c.orig': No such file or directory
>  not ok 1 - setup
>  #
>  #               cp "$TEST_DIRECTORY/t4256/1/mailinfo.c.orig" mailinfo.c &&
>  #               git add mailinfo.c &&
>  #               git commit -m initial
>  #
>
> Known issue?

My bad: this was operator error:

 $ git status -s
  D t/t4256/1/mailinfo.c.orig

The issue was that I ran dh_clean, which removed the .orig file.  I'll
fix the issue on my side.  Sorry for the false alarm.

Sincerely,
Jonathan

      reply	other threads:[~2018-09-04 23:25 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-25 21:50 [PATCH] mailinfo: support format=flowed René Scharfe
2018-08-29 20:19 ` Junio C Hamano
2018-09-04 23:19 ` Jonathan Nieder
2018-09-04 23:25   ` Jonathan Nieder [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=20180904232542.GC34268@aiede.svl.corp.google.com \
    --to=jrnieder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=l.s.r@web.de \
    /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).