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 derrickstolee committed Oct 23, 2019
2 parents 78fb0f7 + 7a4f9f4 commit 7764c13
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 @@ -15,6 +15,7 @@
#include "sha1-array.h"
#include "gpg-interface.h"
#include "cache.h"
#include "gvfs.h"

int option_parse_push_signed(const struct option *opt,
const char *arg, int unset)
Expand All @@ -40,7 +41,7 @@ int option_parse_push_signed(const struct option *opt,

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))
return;

Expand Down

0 comments on commit 7764c13

Please sign in to comment.