mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'maint'
* maint: fast-import: Fail if a non-existant commit is used for merge fast-import: Avoid infinite loop after reset [sp: Minor evil merge to deal with type_names array moving to be private in 'master'.]
This commit is contained in:
commit
6b4318e604
|
@ -220,7 +220,8 @@ struct branch
|
|||
const char *name;
|
||||
struct tree_entry branch_tree;
|
||||
uintmax_t last_commit;
|
||||
unsigned int pack_id;
|
||||
unsigned active : 1;
|
||||
unsigned pack_id : PACK_ID_BITS;
|
||||
unsigned char sha1[20];
|
||||
};
|
||||
|
||||
|
@ -528,6 +529,7 @@ static struct branch *new_branch(const char *name)
|
|||
b->table_next_branch = branch_table[hc];
|
||||
b->branch_tree.versions[0].mode = S_IFDIR;
|
||||
b->branch_tree.versions[1].mode = S_IFDIR;
|
||||
b->active = 0;
|
||||
b->pack_id = MAX_PACK_ID;
|
||||
branch_table[hc] = b;
|
||||
branch_count++;
|
||||
|
@ -1547,6 +1549,7 @@ static void unload_one_branch(void)
|
|||
e = active_branches;
|
||||
active_branches = e->active_next_branch;
|
||||
}
|
||||
e->active = 0;
|
||||
e->active_next_branch = NULL;
|
||||
if (e->branch_tree.tree) {
|
||||
release_tree_content_recursive(e->branch_tree.tree);
|
||||
|
@ -1559,10 +1562,13 @@ static void unload_one_branch(void)
|
|||
static void load_branch(struct branch *b)
|
||||
{
|
||||
load_tree(&b->branch_tree);
|
||||
b->active_next_branch = active_branches;
|
||||
active_branches = b;
|
||||
cur_active_branches++;
|
||||
branch_load_count++;
|
||||
if (!b->active) {
|
||||
b->active = 1;
|
||||
b->active_next_branch = active_branches;
|
||||
active_branches = b;
|
||||
cur_active_branches++;
|
||||
branch_load_count++;
|
||||
}
|
||||
}
|
||||
|
||||
static void file_change_m(struct branch *b)
|
||||
|
@ -1746,7 +1752,14 @@ static struct hash_list *cmd_merge(unsigned int *count)
|
|||
if (oe->type != OBJ_COMMIT)
|
||||
die("Mark :%" PRIuMAX " not a commit", idnum);
|
||||
hashcpy(n->sha1, oe->sha1);
|
||||
} else if (get_sha1(from, n->sha1))
|
||||
} else if (!get_sha1(from, n->sha1)) {
|
||||
unsigned long size;
|
||||
char *buf = read_object_with_reference(n->sha1,
|
||||
commit_type, &size, n->sha1);
|
||||
if (!buf || size < 46)
|
||||
die("Not a valid commit: %s", from);
|
||||
free(buf);
|
||||
} else
|
||||
die("Invalid ref name or SHA1 expression: %s", from);
|
||||
|
||||
n->next = NULL;
|
||||
|
|
Loading…
Reference in a new issue