projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] git-rebase-script: rebase local commits to new upstream head.
[git.git]
/
fsck-cache.c
diff --git
a/fsck-cache.c
b/fsck-cache.c
index
6ac122b
..
7c55fe5
100644
(file)
--- a/
fsck-cache.c
+++ b/
fsck-cache.c
@@
-74,10
+74,6
@@
static void check_connectivity(void)
refs->item->type, sha1_to_hex(refs->item->sha1));
}
refs->item->type, sha1_to_hex(refs->item->sha1));
}
- /* Don't bother with tag reachability. */
- if (obj->type == tag_type)
- continue;
-
if (show_unreachable && !(obj->flags & REACHABLE)) {
if (obj->attached_deltas)
printf("foreign delta reference %s\n",
if (show_unreachable && !(obj->flags & REACHABLE)) {
if (obj->attached_deltas)
printf("foreign delta reference %s\n",
@@
-203,6
+199,8
@@
static int fsck_tree(struct tree *item)
static int fsck_commit(struct commit *commit)
{
static int fsck_commit(struct commit *commit)
{
+ free(commit->buffer);
+ commit->buffer = NULL;
if (!commit->tree)
return -1;
if (!commit->parents && show_root)
if (!commit->tree)
return -1;
if (!commit->parents && show_root)
@@
-366,7
+364,7
@@
static int read_sha1_reference(const char *path)
return 0;
}
return 0;
}
-static
void
find_file_objects(const char *base, const char *name)
+static
int
find_file_objects(const char *base, const char *name)
{
int baselen = strlen(base);
int namelen = strlen(name);
{
int baselen = strlen(base);
int namelen = strlen(name);
@@
-377,34
+375,36
@@
static void find_file_objects(const char *base, const char *name)
path[baselen] = '/';
memcpy(path + baselen + 1, name, namelen+1);
if (stat(path, &st) < 0)
path[baselen] = '/';
memcpy(path + baselen + 1, name, namelen+1);
if (stat(path, &st) < 0)
- return;
+ return
0
;
/*
* Recurse into directories
*/
if (S_ISDIR(st.st_mode)) {
/*
* Recurse into directories
*/
if (S_ISDIR(st.st_mode)) {
+ int count = 0;
DIR *dir = opendir(path);
if (dir) {
struct dirent *de;
while ((de = readdir(dir)) != NULL) {
if (de->d_name[0] == '.')
continue;
DIR *dir = opendir(path);
if (dir) {
struct dirent *de;
while ((de = readdir(dir)) != NULL) {
if (de->d_name[0] == '.')
continue;
- find_file_objects(path, de->d_name);
+
count +=
find_file_objects(path, de->d_name);
}
closedir(dir);
}
}
closedir(dir);
}
- return;
- }
- if (S_ISREG(st.st_mode)) {
- read_sha1_reference(path);
- return;
+ return count;
}
}
+ if (S_ISREG(st.st_mode))
+ return read_sha1_reference(path) == 0;
+ return 0;
}
static void get_default_heads(void)
{
char *git_dir = gitenv(GIT_DIR_ENVIRONMENT) ? : DEFAULT_GIT_DIR_ENVIRONMENT;
}
static void get_default_heads(void)
{
char *git_dir = gitenv(GIT_DIR_ENVIRONMENT) ? : DEFAULT_GIT_DIR_ENVIRONMENT;
- find_file_objects(git_dir, "refs");
+ int count = find_file_objects(git_dir, "refs");
+ if (!count)
+ die("No default references");
}
int main(int argc, char **argv)
}
int main(int argc, char **argv)