undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a strbuf for copying the command line for the reflog.

Browse Source 
Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Kristian Høgsberg 2007-12-04 02:25:46 -05:00 committed by Junio C Hamano
parent 0240e21aae
commit 2d324efad6
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
builtin-fetch.c
View File

@ -14,7 +14,7 @@ static const char fetch_usage[] = "git-fetch [-a | --append] [--upload-pack <upl
static int append, force, tags, no_tags, update_head_ok, verbose, quiet; static int append, force, tags, no_tags, update_head_ok, verbose, quiet;
static const char *depth; static const char *depth;
static char *default_rla = NULL; static struct strbuf default_rla = STRBUF_INIT;
static struct transport *transport; static struct transport *transport;
static void unlock_pack(void) static void unlock_pack(void)
@ -142,7 +142,7 @@ static int s_update_ref(const char *action,
static struct ref_lock *lock; static struct ref_lock *lock;
if (!rla) if (!rla)
rla = default_rla; rla = default_rla.buf;
snprintf(msg, sizeof(msg), "%s: %s", rla, action); snprintf(msg, sizeof(msg), "%s: %s", rla, action);
lock = lock_any_ref_for_update(ref->name, lock = lock_any_ref_for_update(ref->name,
check_old ? ref->old_sha1 : NULL, 0); check_old ? ref->old_sha1 : NULL, 0);
@ -543,16 +543,19 @@ static void set_option(const char *name, const char *value)
int cmd_fetch(int argc, const char **argv, const char *prefix) int cmd_fetch(int argc, const char **argv, const char *prefix)
{ {
struct remote *remote; struct remote *remote;
int i, j, rla_offset; int i;
static const char **refs = NULL; static const char **refs = NULL;
int ref_nr = 0; int ref_nr = 0;
int cmd_len = 0;
const char *upload_pack = NULL; const char *upload_pack = NULL;
int keep = 0; int keep = 0;
/* Record the command line for the reflog */
strbuf_addstr(&default_rla, "fetch");
for (i = 1; i < argc; i++)
strbuf_addf(&default_rla, " %s", argv[i]);
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
const char *arg = argv[i]; const char *arg = argv[i];
cmd_len += strlen(arg);
if (arg[0] != '-') if (arg[0] != '-')
break; break;
@ -613,17 +616,6 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
usage(fetch_usage); usage(fetch_usage);
} }
for (j = i; j < argc; j++)
cmd_len += strlen(argv[j]);
default_rla = xmalloc(cmd_len + 5 + argc + 1);
sprintf(default_rla, "fetch");
rla_offset = strlen(default_rla);
for (j = 1; j < argc; j++) {
sprintf(default_rla + rla_offset, " %s", argv[j]);
rla_offset += strlen(argv[j]) + 1;
}
if (i == argc) if (i == argc)
remote = remote_get(NULL); remote = remote_get(NULL);
else else