diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-21 18:30:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-21 18:30:15 (GMT) |
| commit | d17811154b2482bae3fd089f29528e7b7b7ce62b (patch) | |
| tree | 2cfe574ab7b61341efe6666744e85e6ac75da3af /merge-recursive.c | |
| parent | c108a77f8f9de5b42c9661b9d4584f54f57766ec (diff) | |
| parent | 00a4b0350198ce2039af2360ff5d83a1f8ee6cd9 (diff) | |
| download | git-d17811154b2482bae3fd089f29528e7b7b7ce62b.zip git-d17811154b2482bae3fd089f29528e7b7b7ce62b.tar.gz git-d17811154b2482bae3fd089f29528e7b7b7ce62b.tar.bz2 | |
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
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 2f232ad..869092f 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -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)) { |