From: Nazri Ramliy <ayiehere@gmail.com>
To: git@vger.kernel.org, gitster@pobox.com
Cc: Nazri Ramliy <ayiehere@gmail.com>
Subject: [PATCH] diff: bugfix: binary file permission regression
Date: Fri, 11 Jun 2010 02:31:25 +0800 [thread overview]
Message-ID: <1276194685-28098-1-git-send-email-ayiehere@gmail.com> (raw)
Regression at 3e97c7c6af2901cec63bf35fcd43ae3472e24af8
"No diff -b/-w output for all-whitespace changes"
When a binary file's permission is modified, git status
reports the file as modified, but git diff shows nothing.
Add a test file too.
---
diff.c | 4 ++--
t/t4043-diff-binary-permission.sh | 26 ++++++++++++++++++++++++++
2 files changed, 28 insertions(+), 2 deletions(-)
create mode 100755 t/t4043-diff-binary-permission.sh
diff --git a/diff.c b/diff.c
index 494f560..0aa1a2d 100644
--- a/diff.c
+++ b/diff.c
@@ -1745,12 +1745,12 @@ static void builtin_diff(const char *name_a,
(!textconv_two && diff_filespec_is_binary(two)) )) {
if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
die("unable to read files to diff");
+ fprintf(o->file, "%s", header.buf);
+ strbuf_reset(&header);
/* Quite common confusing case */
if (mf1.size == mf2.size &&
!memcmp(mf1.ptr, mf2.ptr, mf1.size))
goto free_ab_and_return;
- fprintf(o->file, "%s", header.buf);
- strbuf_reset(&header);
if (DIFF_OPT_TST(o, BINARY))
emit_binary_diff(o->file, &mf1, &mf2);
else
diff --git a/t/t4043-diff-binary-permission.sh b/t/t4043-diff-binary-permission.sh
new file mode 100755
index 0000000..7b77fb3
--- /dev/null
+++ b/t/t4043-diff-binary-permission.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# Copyright (c) 2010 Nazri Ramliy
+#
+
+test_description='Test permission change on binary files
+
+'
+. ./test-lib.sh
+
+/bin/echo -e "\0\0\0\0" > a.bin
+chmod 644 a.bin
+git update-index --add a.bin
+chmod 755 a.bin
+
+cat << EOF > expect
+diff --git a/a.bin b/a.bin
+old mode 100644
+new mode 100755
+EOF
+
+git diff > out
+
+test_expect_success 'diff-binary-permission' 'test_cmp expect out'
+
+test_done
--
1.7.1.245.g7c42e.dirty
next reply other threads:[~2010-06-10 18:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-10 18:31 Nazri Ramliy [this message]
2010-06-11 7:06 ` [PATCH] diff: bugfix: binary file permission regression Nazri Ramliy
2010-06-11 7:24 ` Christian Couder
2010-06-11 9:45 ` Nazri Ramliy
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1276194685-28098-1-git-send-email-ayiehere@gmail.com \
--to=ayiehere@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).