Merge branch 'rj/warning-uninitialized-fix'
Compilation fix. * rj/warning-uninitialized-fix: read-cache: fix an -Wmaybe-uninitialized warning -Wuninitialized: remove some 'init-self' workarounds
This commit is contained in:
commit
d17811154b
@ -536,7 +536,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
|
||||
mark_edges_uninteresting(&revs, show_edge);
|
||||
|
||||
if (bisect_list) {
|
||||
int reaches = reaches, all = all;
|
||||
int reaches, all;
|
||||
|
||||
find_bisection(&revs.commits, &reaches, &all, bisect_find_all);
|
||||
|
||||
|
@ -3005,7 +3005,7 @@ static void cat_blob(struct object_entry *oe, struct object_id *oid)
|
||||
|
||||
static void parse_get_mark(const char *p)
|
||||
{
|
||||
struct object_entry *oe = oe;
|
||||
struct object_entry *oe;
|
||||
char output[GIT_MAX_HEXSZ + 2];
|
||||
|
||||
/* get-mark SP <object> LF */
|
||||
@ -3022,7 +3022,7 @@ static void parse_get_mark(const char *p)
|
||||
|
||||
static void parse_cat_blob(const char *p)
|
||||
{
|
||||
struct object_entry *oe = oe;
|
||||
struct object_entry *oe;
|
||||
struct object_id oid;
|
||||
|
||||
/* cat-blob SP <object> LF */
|
||||
|
@ -2090,7 +2090,7 @@ int merge_recursive(struct merge_options *o,
|
||||
{
|
||||
struct commit_list *iter;
|
||||
struct commit *merged_common_ancestors;
|
||||
struct tree *mrtree = mrtree;
|
||||
struct tree *mrtree;
|
||||
int clean;
|
||||
|
||||
if (show(o, 4)) {
|
||||
|
@ -2110,13 +2110,15 @@ static int ce_write_entry(git_hash_ctx *c, int fd, struct cache_entry *ce,
|
||||
struct strbuf *previous_name, struct ondisk_cache_entry *ondisk)
|
||||
{
|
||||
int size;
|
||||
int saved_namelen = saved_namelen; /* compiler workaround */
|
||||
int result;
|
||||
unsigned int saved_namelen;
|
||||
int stripped_name = 0;
|
||||
static unsigned char padding[8] = { 0x00 };
|
||||
|
||||
if (ce->ce_flags & CE_STRIP_NAME) {
|
||||
saved_namelen = ce_namelen(ce);
|
||||
ce->ce_namelen = 0;
|
||||
stripped_name = 1;
|
||||
}
|
||||
|
||||
if (ce->ce_flags & CE_EXTENDED)
|
||||
@ -2156,7 +2158,7 @@ static int ce_write_entry(git_hash_ctx *c, int fd, struct cache_entry *ce,
|
||||
strbuf_splice(previous_name, common, to_remove,
|
||||
ce->name + common, ce_namelen(ce) - common);
|
||||
}
|
||||
if (ce->ce_flags & CE_STRIP_NAME) {
|
||||
if (stripped_name) {
|
||||
ce->ce_namelen = saved_namelen;
|
||||
ce->ce_flags &= ~CE_STRIP_NAME;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user