Odd issue with Git-am

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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?


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]