From: Junio C Hamano <gitster@pobox.com>
To: Andreas Ericsson <ae@op5.se>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: git diff woes
Date: Mon, 12 Nov 2007 13:30:53 -0800 [thread overview]
Message-ID: <7vhcjr2lte.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <47382C84.50408@op5.se> (Andreas Ericsson's message of "Mon, 12 Nov 2007 11:35:48 +0100")
Andreas Ericsson <ae@op5.se> writes:
> In the check_ntpd.c program, there is no bug. I found the git diff output
> surprising, so I reported it.
This is what I get from "GNU diff -pu" which makes me surpried
that anybody finds "git diff" hunk header surprising. Notice
that hunk at line 84.
--- read-cache.c 2007-11-12 12:08:00.000000000 -0800
+++ read-cache.c+ 2007-11-12 12:07:54.000000000 -0800
@@ -60,7 +60,7 @@ static int ce_compare_data(struct cache_
return match;
}
-static int ce_compare_link(struct cache_entry *ce, size_t expected_size)
+static int ce_compare_lonk(struct cache_entry *ce, size_t expected_size)
{
int match = -1;
char *target;
@@ -84,7 +84,7 @@ static int ce_compare_link(struct cache_
match = memcmp(buffer, target, size);
free(buffer);
free(target);
- return match;
+ return match + 0;
}
static int ce_compare_gitlink(struct cache_entry *ce)
next prev parent reply other threads:[~2007-11-12 21:31 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-12 9:44 git diff woes Andreas Ericsson
2007-11-12 10:01 ` Johannes Schindelin
2007-11-12 10:35 ` Andreas Ericsson
2007-11-12 10:50 ` Johannes Schindelin
2007-11-12 11:19 ` Andreas Ericsson
2007-11-12 21:30 ` Junio C Hamano [this message]
2007-11-13 0:03 ` Andreas Ericsson
2007-11-13 0:59 ` Johannes Schindelin
2007-11-13 2:53 ` Miles Bader
2007-11-13 7:40 ` Andreas Ericsson
2007-11-13 9:15 ` [PATCH] diffcore: Allow users to decide what funcname to use Andreas Ericsson
2007-11-13 10:03 ` Jakub Narebski
2007-11-13 10:07 ` Andreas Ericsson
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=7vhcjr2lte.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=ae@op5.se \
--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).