Skip to content

Commit

Permalink
Merge pull request #68 send-pack do not check for sha1 file when GVFS…
Browse files Browse the repository at this point in the history
…_MISSING_OK set

send-pack: do not check for sha1 file when GVFS_MISSING_OK set
  • Loading branch information
Kevin Willford authored and dscho committed May 20, 2020
2 parents 3c84ab5 + 8e7c43b commit ebc4717
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion send-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "config.h"
#include "commit.h"
#include "refs.h"
#include "gvfs.h"
#include "object-store.h"
#include "pkt-line.h"
#include "sideband.h"
Expand Down Expand Up @@ -51,7 +52,7 @@ static int send_pack_config(const char *var, const char *value, void *unused)

static void feed_object(const struct object_id *oid, FILE *fh, int negative)
{
if (negative &&
if (negative && !gvfs_config_is_set(GVFS_MISSING_OK) &&
!has_object_file_with_flags(oid,
OBJECT_INFO_SKIP_FETCH_OBJECT |
OBJECT_INFO_QUICK))
Expand Down

0 comments on commit ebc4717

Please sign in to comment.