[PATCH] allow guilt to handle binary files

Yasushi SHOJI· Mar 4, 2009, 14:19 UTC · lore

git plumbings has been working with binary diff for a while. this one liner enable guilt to use those capabilities.

Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com>
---
Hi Jeff,

I just found out that guilt does not yet support binary patch capability git has for a while.

so, before I leave my office, I just tried guilt with this one liner. the result was:

 - my local test with biniary files work (pop/push was check with md5), and
 - all regression test completed without any error

I felt that I just send it out. :-)

# Note: I've googled "guilt bianry" before sending this but could not # find any. I'm not following nether git nor guilt development for a # while. so, let me know if I'm off track.

thanks,

 guilt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to guilt +1 −1

diff --git a/guilt b/guilt
index c98fd30..17a6288 100755
--- a/guilt
+++ b/guilt
@@ -689,7 +689,7 @@ __refresh_patch()
 		fi
 
 		# get the new patch
-		git diff $diffopts "$2" >> "$TMP_DIFF"
+		git diff --binary $diffopts "$2" >> "$TMP_DIFF"
 
 		# move the new patch in
 		mv "$p" "$p~"

-- 
1.6.1.rc3.51.g5832d

Josef 'Jeff' Sipek· Mar 12, 2009, 00:47 UTC · re: Yasushi SHOJI · lore

Re: [PATCH] allow guilt to handle binary files

On Wed, Mar 04, 2009 at 11:19:32PM +0900, Yasushi SHOJI wrote:

Show 17 quoted lines

> git plumbings has been working with binary diff for a while.  this one
> liner enable guilt to use those capabilities.
> 
> Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com>
> ---
> Hi Jeff,
> 
> I just found out that guilt does not yet support binary patch
> capability git has for a while.
> 
> so, before I leave my office, I just tried guilt with this one liner.
> the result was:
> 
>  - my local test with biniary files work (pop/push was check with md5), and
>  - all regression test completed without any error
> 
> I felt that I just send it out. :-)

That's how it works :)

> # Note: I've googled "guilt bianry" before sending this but could not
> # find any.  I'm not following nether git nor guilt development for a
> # while. so, let me know if I'm off track.

Sorry for taking so long...the patch looks fine. I applied it & pushed it out.

I think it would be a good idea to have a regression test that specifically checks binary file handling. I'm not going to get to write it for a couple of days at least, so feel free to give it a shot :)

Thanks!

Josef 'Jeff' Sipek.

-- 
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like
that.
		- Linus Torvalds

patchallow guilt to handle binary files