diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-26 01:08:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-26 01:08:39 -0700 |
| commit | b4c27c186f6282ead5d2af0cfd9b6015b011bc38 (patch) | |
| tree | 4ad1f74af2cd95e8cf0ee82a4b06d6c1ffae5611 /tree-diff.c | |
| parent | 903acca75329841996bbf0c3a32a7cfeb3ae0d0f (diff) | |
| parent | a7f051987c5f020e60da1e5d6ddefc3d443d3299 (diff) | |
| download | git-b4c27c186f6282ead5d2af0cfd9b6015b011bc38.tar.gz | |
Merge branch 'master' into gl/web
* master: (34 commits)
gitweb: git_annotate didn't expect negative numeric timezone
git-svn: add the 'dcommit' command
git-svn: recommend rebase for syncing against an SVN repo
git-svn: establish new connections on commit after fork
describe: fix off-by-one error in --abbrev=40 handling
git-svn(1): improve asciidoc markup
gitview.txt: improve asciidoc markup
git(7): put the synopsis in a verse style paragraph
gitk(1): expand the manpage to look less like a template
git-blame(1): mention options in the synopsis and advertise pickaxe
git-ls-remote(1): document --upload-pack
git-apply(1): document missing options and improve existing ones
update-index -g
n is in fact unused, and is later shadowed.
use name[len] in switch directly, instead of creating a shadowed variable.
builtin-grep.c: remove unused debugging piece.
remove ugly shadowing of loop indexes in subloops.
missing 'static' keywords
git_dir holds pointers to local strings, hence MUST be const.
avoid to use error that shadows the function name, use err instead.
...
Diffstat (limited to 'tree-diff.c')
| -rw-r--r-- | tree-diff.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tree-diff.c b/tree-diff.c index 916f489c5b..7e2f4f088a 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -39,8 +39,7 @@ static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2, const show_entry(opt, "+", t2, base); return 1; } - if (!opt->find_copies_harder && - !memcmp(sha1, sha2, 20) && mode1 == mode2) + if (!opt->find_copies_harder && !hashcmp(sha1, sha2) && mode1 == mode2) return 0; /* |