mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/push-options-via-transport-fix'

Browse Source 
"git push" over http transport did not unquote the push-options
correctly.

* jk/push-options-via-transport-fix:
  remote-curl: unquote incoming push-options
  t5545: factor out http repository setup
This commit is contained in:
Junio C Hamano
2018-02-28 13:37:58 -08:00
parent 0996727879 90dce21eb0
commit 69917e6439
2 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
remote-curl.c
View File

@ -13,6 +13,7 @@
#include "credential.h"
#include "sha1-array.h"
#include "send-pack.h"
#include "quote.h"
static struct remote *remote;
/* always ends with a trailing slash */
@ -145,7 +146,15 @@ static int set_option(const char *name, const char *value)
return -1;
return 0;
} else if (!strcmp(name, "push-option")) {
string_list_append(&options.push_options, value);
if (*value != '"')
string_list_append(&options.push_options, value);
else {
struct strbuf unquoted = STRBUF_INIT;
if (unquote_c_style(&unquoted, value, NULL) < 0)
die("invalid quoting in push-option value");
string_list_append_nodup(&options.push_options,
strbuf_detach(&unquoted, NULL));
}
return 0;
#if LIBCURL_VERSION_NUM >= 0x070a08