send-pack: do not check for sha1 file when GVFS_MISSING_OK set

This commit is contained in:
Kevin Willford 2018-11-16 11:28:59 -07:00 коммит произвёл Johannes Schindelin
Родитель 4f7cfe35e0
Коммит 6fc41139af
1 изменённых файлов: 2 добавлений и 1 удалений

Просмотреть файл

@ -4,6 +4,7 @@
#include "date.h" #include "date.h"
#include "gettext.h" #include "gettext.h"
#include "hex.h" #include "hex.h"
#include "gvfs.h"
#include "object-store-ll.h" #include "object-store-ll.h"
#include "pkt-line.h" #include "pkt-line.h"
#include "sideband.h" #include "sideband.h"
@ -44,7 +45,7 @@ int option_parse_push_signed(const struct option *opt,
static void feed_object(const struct object_id *oid, FILE *fh, int negative) static void feed_object(const struct object_id *oid, FILE *fh, int negative)
{ {
if (negative && if (negative && !gvfs_config_is_set(GVFS_MISSING_OK) &&
!repo_has_object_file_with_flags(the_repository, oid, !repo_has_object_file_with_flags(the_repository, oid,
OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_SKIP_FETCH_OBJECT |
OBJECT_INFO_QUICK)) OBJECT_INFO_QUICK))