global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 02:43:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/skip-count' into next

Browse Source 
* jc/skip-count:
  revision: --skip=<n>
  GIT 1.4.4.3
  clarify some error messages wrt unknown object types
  simplify inclusion of system header files.
  index-pack usage of mmap() is unacceptably slower on many OSes other than Linux
  gitweb: Show '...' links in "summary" view only if there are more items
  config_rename_section: fix FILE* leak
  Remove COLLISION_CHECK from Makefile since it's not used.
  fix populate-filespec
  git-cvsserver: fix breakage when calling git merge-file
This commit is contained in:
Junio C Hamano
2006-12-20 11:26:19 -08:00
parent 205bf47f13 d5db6c9ee7
commit 545bc00371
81 changed files with 168 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
diff.c
View File

@@ -1,9 +1,6 @@
/*
* Copyright (C) 2005 Junio C Hamano
*/
#include <sys/types.h>
#include <sys/wait.h>
#include <signal.h>
#include "cache.h"
#include "quote.h"
#include "diff.h"
@@ -1237,7 +1234,7 @@ static int reuse_worktree_file(const char *name, const unsigned char *sha1, int
* objects however would tend to be slower as they need
* to be individually opened and inflated.
*/
if (FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1, NULL))
if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1, NULL))
return 0;
len = strlen(name);