* [PATCH 09/14] merge-recursive.c: Initialise variable to suppress msvc warning
@ 2010-12-04 19:08 Ramsay Jones
0 siblings, 0 replies; only message in thread
From: Ramsay Jones @ 2010-12-04 19:08 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Johannes Sixt, GIT Mailing-list
The msvc compiler thinks a variable could be used while
uninitialised and issues the following warning:
...\git\merge-recursive.c(1599) : warning C4700: uninitialized local \
variable 'mrtree' used
In order to suppress the warning we simply initialise the mrtree
pointer variable to NULL.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
---
merge-recursive.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 16c2dbe..d5423ad 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1596,7 +1596,7 @@ int merge_recursive(struct merge_options *o,
{
struct commit_list *iter;
struct commit *merged_common_ancestors;
- struct tree *mrtree = mrtree;
+ struct tree *mrtree = NULL;
int clean;
if (show(o, 4)) {
--
1.7.3
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2010-12-04 21:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-04 19:08 [PATCH 09/14] merge-recursive.c: Initialise variable to suppress msvc warning Ramsay Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).