diff options
| author |   Fernando J. Pereda <ferdy@gentoo.org> | 2005-12-02 10:40:22 +0000 |
|---|---|---|
| committer | Fernando J. Pereda <ferdy@gentoo.org> | 2005-12-02 10:40:22 +0000 |
| commit | d47da1f93e356c3cbb8fa364d1dc4a74edc98d9c (patch) | |
| tree | 325f3120f55c93f185f3cd95ec409350c0b331a7 /dev-util | |
| parent | Version bump, removing old version (diff) | |
| download | gentoo-2-d47da1f93e356c3cbb8fa364d1dc4a74edc98d9c.tar.gz gentoo-2-d47da1f93e356c3cbb8fa364d1dc4a74edc98d9c.tar.bz2 gentoo-2-d47da1f93e356c3cbb8fa364d1dc4a74edc98d9c.zip | |
remove unneeded patch
(Portage version: 2.0.51.22-r3)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/git/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/git/files/git-0.99.9j-binary-diff-fix.patch | 46 |
2 files changed, 5 insertions, 47 deletions
diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog index 15d158c465bc..fa6600738caf 100644 --- a/dev-util/git/ChangeLog +++ b/dev-util/git/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/git # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.48 2005/12/01 21:10:20 ferdy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.49 2005/12/02 10:40:22 ferdy Exp $ + + 02 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> + -files/git-0.99.9j-binary-diff-fix.patch: + remove unneeded patch *git-0.99.9k (01 Dec 2005) diff --git a/dev-util/git/files/git-0.99.9j-binary-diff-fix.patch b/dev-util/git/files/git-0.99.9j-binary-diff-fix.patch deleted file mode 100644 index 6d5e0965b52f..000000000000 --- a/dev-util/git/files/git-0.99.9j-binary-diff-fix.patch +++ /dev/null @@ -1,46 +0,0 @@ -From: Junio C Hamano <junkio@cox.net> -Date: Fri, 18 Nov 2005 04:46:29 +0000 (-0800) -Subject: Deal with binary diff output from GNU diff 2.8.7 -X-Git-Url: http://kernel.org/git/?p=git/git.git;a=commitdiff;h=3200d1aee0c22a34d075aafefe3e92f4f7d08840 - - Deal with binary diff output from GNU diff 2.8.7 - - Some vintage of diff says just "Files X and Y differ\n", instead - of "Binary files X and Y differ\n", so catch both patterns. - - Signed-off-by: Junio C Hamano <junkio@cox.net> ---- - ---- a/apply.c -+++ b/apply.c -@@ -893,12 +893,24 @@ static int parse_chunk(char *buffer, uns - patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch); - - if (!patchsize) { -- static const char binhdr[] = "Binary files "; -- -- if (sizeof(binhdr) - 1 < size - offset - hdrsize && -- !memcmp(binhdr, buffer + hdrsize + offset, -- sizeof(binhdr)-1)) -- patch->is_binary = 1; -+ static const char *binhdr[] = { -+ "Binary files ", -+ "Files ", -+ NULL, -+ }; -+ int i; -+ int hd = hdrsize + offset; -+ unsigned long llen = linelen(buffer + hd, size - hd); -+ -+ if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) -+ for (i = 0; binhdr[i]; i++) { -+ int len = strlen(binhdr[i]); -+ if (len < size - hd && -+ !memcmp(binhdr[i], buffer + hd, len)) { -+ patch->is_binary = 1; -+ break; -+ } -+ } - - /* Empty patch cannot be applied if: - * - it is a binary patch and we do not do binary_replace, or |