Skip to content
Permalink
Browse files

Merge pull request #2178 from dscho/drop-obsolete-patches

Drop some obsolete patches
  • Loading branch information...
dscho committed May 6, 2019
2 parents 3a29b23 + 71465b1 commit 10590655093c80575a475eb1523801f2398a6e91
Showing with 2 additions and 23 deletions.
  1. +0 −2 Documentation/config.txt
  2. +0 −5 Documentation/config/sendpack.txt
  3. +1 −3 credential.c
  4. +1 −13 send-pack.c
@@ -408,8 +408,6 @@ include::config/reset.txt[]

include::config/sendemail.txt[]

include::config/sendpack.txt[]

include::config/sequencer.txt[]

include::config/showbranch.txt[]

This file was deleted.

@@ -136,9 +136,7 @@ static void credential_getpass(struct credential *c)
{
if (!c->username)
c->username = credential_ask_one("Username", c,
(getenv("GIT_ASKPASS") ?
PROMPT_ASKPASS : 0) |
PROMPT_ECHO);
PROMPT_ASKPASS|PROMPT_ECHO);
if (!c->password)
c->password = credential_ask_one("Password", c,
PROMPT_ASKPASS);
@@ -38,16 +38,6 @@ int option_parse_push_signed(const struct option *opt,
die("bad %s argument: %s", opt->long_name, arg);
}

static int config_use_sideband = 1;

static int send_pack_config(const char *var, const char *value, void *unused)
{
if (!strcmp("sendpack.sideband", var))
config_use_sideband = git_config_bool(var, value);

return 0;
}

static void feed_object(const struct object_id *oid, FILE *fh, int negative)
{
if (negative && !has_object_file(oid))
@@ -400,16 +390,14 @@ int send_pack(struct send_pack_args *args,
const char *push_cert_nonce = NULL;
struct packet_reader reader;

git_config(send_pack_config, NULL);

/* Does the other end support the reporting? */
if (server_supports("report-status"))
status_report = 1;
if (server_supports("delete-refs"))
allow_deleting_refs = 1;
if (server_supports("ofs-delta"))
args->use_ofs_delta = 1;
if (config_use_sideband && server_supports("side-band-64k"))
if (server_supports("side-band-64k"))
use_sideband = 1;
if (server_supports("quiet"))
quiet_supported = 1;

0 comments on commit 1059065

Please sign in to comment.
You can’t perform that action at this time.