diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-06-28 01:46:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-28 03:58:55 -0700 |
| commit | 2c0b4dfd5a2099bdbbdfad71c3193a25c9052f2d (patch) | |
| tree | a3dc8e955138f62d94bbfde10f8d68bdb6230ffc | |
| parent | Fix some more diff options changes. (diff) | |
| download | tgif-2c0b4dfd5a2099bdbbdfad71c3193a25c9052f2d.tar.xz | |
combine-diff.c: type sanity.
In diff_tree_combined(), show_log_first boolean is initialized with
rev->loginfo (pointer to a string); the intention is that if we have
some string to be emitted we would want to remember that fact. Picky
compilers are offended by this, so make the expression a bit type-safer.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | combine-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c index 7178b25c53..2fd0ced395 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -841,7 +841,7 @@ void diff_tree_combined(const unsigned char *sha1, diffopts.output_format = DIFF_FORMAT_NO_OUTPUT; diffopts.recursive = 1; - show_log_first = rev->loginfo; + show_log_first = !!rev->loginfo; needsep = 0; /* find set of paths that everybody touches */ for (i = 0; i < num_parent; i++) { |