projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Documentation/git-add: kill remaining <filepattern>
[git.git]
/
fetch-pack.c
diff --git
a/fetch-pack.c
b/fetch-pack.c
index 099ff4ddffecee85d964bfa9f03795ed168edf5f..6d8926a5504a6cd93e19860f85d58816bdd5c222 100644
(file)
--- a/
fetch-pack.c
+++ b/
fetch-pack.c
@@
-594,6
+594,9
@@
static int everything_local(struct fetch_pack_args *args,
for (ref = *refs; ref; ref = ref->next) {
struct object *o;
for (ref = *refs; ref; ref = ref->next) {
struct object *o;
+ if (!has_sha1_file(ref->old_sha1))
+ continue;
+
o = parse_object(ref->old_sha1);
if (!o)
continue;
o = parse_object(ref->old_sha1);
if (!o)
continue;
@@
-874,8
+877,6
@@
static int fetch_pack_config(const char *var, const char *value, void *cb)
return git_default_config(var, value, cb);
}
return git_default_config(var, value, cb);
}
-static struct lock_file lock;
-
static void fetch_pack_setup(void)
{
static int did_setup;
static void fetch_pack_setup(void)
{
static int did_setup;
@@
-917,6
+918,7
@@
struct ref *fetch_pack(struct fetch_pack_args *args,
ref_cpy = do_fetch_pack(args, fd, ref, sought, pack_lockfile);
if (args->depth > 0) {
ref_cpy = do_fetch_pack(args, fd, ref, sought, pack_lockfile);
if (args->depth > 0) {
+ static struct lock_file lock;
struct cache_time mtime;
struct strbuf sb = STRBUF_INIT;
char *shallow = git_path("shallow");
struct cache_time mtime;
struct strbuf sb = STRBUF_INIT;
char *shallow = git_path("shallow");