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

Merge branch 'jk/fast-import-history-bugfix'

Browse Source 
The memory ownership model of the "git fast-import" got
straightened out.

* jk/fast-import-history-bugfix:
  fast-import: duplicate into history rather than passing ownership
  fast-import: duplicate parsed encoding string
This commit is contained in:
Junio C Hamano 2019-09-30 13:19:25 +09:00
commit 991fd97b9a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fast-import.c
View File

@ -1763,7 +1763,6 @@ static int read_next_command(void)
} else { } else {
struct recent_command *rc; struct recent_command *rc;
strbuf_detach(&command_buf, NULL);
stdin_eof = strbuf_getline_lf(&command_buf, stdin); stdin_eof = strbuf_getline_lf(&command_buf, stdin);
if (stdin_eof) if (stdin_eof)
return EOF; return EOF;
@ -1784,7 +1783,7 @@ static int read_next_command(void)
free(rc->buf); free(rc->buf);
} }
rc->buf = command_buf.buf; rc->buf = xstrdup(command_buf.buf);
rc->prev = cmd_tail; rc->prev = cmd_tail;
rc->next = cmd_hist.prev; rc->next = cmd_hist.prev;
rc->prev->next = rc; rc->prev->next = rc;
@ -1833,7 +1832,6 @@ static int parse_data(struct strbuf *sb, uintmax_t limit, uintmax_t *len_res)
char *term = xstrdup(data); char *term = xstrdup(data);
size_t term_len = command_buf.len - (data - command_buf.buf); size_t term_len = command_buf.len - (data - command_buf.buf);
strbuf_detach(&command_buf, NULL);
for (;;) { for (;;) {
if (strbuf_getline_lf(&command_buf, stdin) == EOF) if (strbuf_getline_lf(&command_buf, stdin) == EOF)
die("EOF in data (terminator '%s' not found)", term); die("EOF in data (terminator '%s' not found)", term);
@ -2588,7 +2586,7 @@ static void parse_new_commit(const char *arg)
struct branch *b; struct branch *b;
char *author = NULL; char *author = NULL;
char *committer = NULL; char *committer = NULL;
const char *encoding = NULL; char *encoding = NULL;
struct hash_list *merge_list = NULL; struct hash_list *merge_list = NULL;
unsigned int merge_count; unsigned int merge_count;
unsigned char prev_fanout, new_fanout; unsigned char prev_fanout, new_fanout;
@ -2611,8 +2609,10 @@ static void parse_new_commit(const char *arg)
} }
if (!committer) if (!committer)
die("Expected committer but didn't get one"); die("Expected committer but didn't get one");
if (skip_prefix(command_buf.buf, "encoding ", &encoding)) if (skip_prefix(command_buf.buf, "encoding ", &v)) {
encoding = xstrdup(v);
read_next_command(); read_next_command();
}
parse_data(&msg, 0, NULL); parse_data(&msg, 0, NULL);
read_next_command(); read_next_command();
parse_from(b); parse_from(b);
@ -2686,6 +2686,7 @@ static void parse_new_commit(const char *arg)
strbuf_addbuf(&new_data, &msg); strbuf_addbuf(&new_data, &msg);
free(author); free(author);
free(committer); free(committer);
free(encoding);
if (!store_object(OBJ_COMMIT, &new_data, NULL, &b->oid, next_mark)) if (!store_object(OBJ_COMMIT, &new_data, NULL, &b->oid, next_mark))
b->pack_id = pack_id; b->pack_id = pack_id;