From: alan@clueserver.org
To: git@vger.kernel.org
Subject: Odd issue with Git-am
Date: Fri, 20 Nov 2015 13:02:42 -0800 [thread overview]
Message-ID: <7df90d19cfa7e987a23a22b5cd90fe6a.squirrel@clueserver.org> (raw)
The following describes bad behavior, but it is bad behavior that git-am
does not flag as bad. It just drops data silently.
I have a developer who has a patch that I am importing into git with
git-am. (Currently they have a quilt-like setup that is full of bad and
incomplete patches.)
At some point in the past, someone hand edited the patch and added two
lines. They did not, however, change the @@ references in the patch for
the line count.
The patch added a file. The line that contained the length of the file was
"@@ -0,0 +0,1155 @@" instead of "@@ -0,0 +0,1157 @@". The result was that
when the patch was applied it silently dropped the last two lines of the
file.
My assumption is that it should either apply the full file and/or throw an
error. This just drops data silently.
Yes people should not be editing patches by hand. This migration is part
of the effort to get them to stop doing that.
Shouldn't git-am detect that the patch data and the meta data do not match
and warn the user or am I just being too damn picky here?
next reply other threads:[~2015-11-20 21:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-20 21:02 alan [this message]
2015-11-20 21:22 ` Odd issue with Git-am Stefan Beller
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=7df90d19cfa7e987a23a22b5cd90fe6a.squirrel@clueserver.org \
--to=alan@clueserver.org \
--cc=git@vger.kernel.org \
/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).