summaryrefslogtreecommitdiff
path: root/ssh-fetch.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-26 01:08:39 -0700
committerJunio C Hamano <junkio@cox.net>2006-08-26 01:08:39 -0700
commitb4c27c186f6282ead5d2af0cfd9b6015b011bc38 (patch)
tree4ad1f74af2cd95e8cf0ee82a4b06d6c1ffae5611 /ssh-fetch.c
parent903acca75329841996bbf0c3a32a7cfeb3ae0d0f (diff)
parenta7f051987c5f020e60da1e5d6ddefc3d443d3299 (diff)
downloadgit-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 'ssh-fetch.c')
-rw-r--r--ssh-fetch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ssh-fetch.c b/ssh-fetch.c
index 0b89df6dda..b006c5c980 100644
--- a/ssh-fetch.c
+++ b/ssh-fetch.c
@@ -67,7 +67,7 @@ int fetch(unsigned char *sha1)
signed char remote;
struct object_list *temp;
- if (memcmp(sha1, in_transit->item->sha1, 20)) {
+ if (hashcmp(sha1, in_transit->item->sha1)) {
/* we must have already fetched it to clean the queue */
return has_sha1_file(sha1) ? 0 : -1;
}