summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-13 05:52:19 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-13 05:52:19 (GMT)
commit8042ed1cebd37419ff38f540482355c0f1d30936 (patch)
tree8cc29ba2b6f5eac2d46f5222e8ff1dc1e7f6a7bd /xdiff
parente2b7008752d85874919ea718d098fec01b4a9019 (diff)
parentc53d696bcc2894b0df277e617740b15bac794df9 (diff)
downloadgit-8042ed1cebd37419ff38f540482355c0f1d30936.zip
git-8042ed1cebd37419ff38f540482355c0f1d30936.tar.gz
git-8042ed1cebd37419ff38f540482355c0f1d30936.tar.bz2
Merge branch 'master' into js/merge
* master: (42 commits) git-svn: correctly handle packed-refs in refs/remotes/ add test case for recursive merge git-svn: correctly display fatal() error messages git-svn: allow dcommit to take an alternate head git-svn: enable logging of information not supported by git Clarify fetch error for missing objects. Move Fink and Ports check to after config file shortlog: fix segfault on empty authorname shortlog: remove "[PATCH]" prefix from shortlog output Make sure the empty tree exists when needed in merge-recursive. Don't use memcpy when source and dest. buffers may overlap no need to install manpages as executable Documentation: simpler shared repository creation shortlog: fix segfault on empty authorname Add branch.*.merge warning and documentation update Fix perl/ build. git-svn: use do_switch for --follow-parent if the SVN library supports it Fix documentation copy&paste typo git-svn: extra error check to ensure we open a file correctly Documentation: update git-clone man page with new behavior ...
Diffstat (limited to 'xdiff')
-rw-r--r--xdiff/xutils.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index 9e4bb47..1b899f3 100644
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -230,7 +230,8 @@ unsigned long xdl_hash_record(char const **data, char const *top, long flags) {
while (ptr + 1 < top && isspace(ptr[1])
&& ptr[1] != '\n')
ptr++;
- if (flags & XDF_IGNORE_WHITESPACE_CHANGE) {
+ if (flags & XDF_IGNORE_WHITESPACE_CHANGE
+ && ptr[1] != '\n') {
ha += (ha << 5);
ha ^= (unsigned long) ' ';
}