summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2011-04-29 09:42:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-06-01 20:54:17 (GMT)
commit6051561a6cc8d715ce6243c26712448f6e32fe4e (patch)
treeb4277c081651b99c625678278c7e06c2500e54ce
parent2b0b64ee850e72b9a88c821c418b1620fccf2092 (diff)
downloadgit-6051561a6cc8d715ce6243c26712448f6e32fe4e.zip
git-6051561a6cc8d715ce6243c26712448f6e32fe4e.tar.gz
git-6051561a6cc8d715ce6243c26712448f6e32fe4e.tar.bz2
diffcore-rename.c: avoid set-but-not-used warning
Since 9d8a5a5 (diffcore-rename: refactor "too many candidates" logic, 2011-01-06), diffcore_rename() initializes num_src but does not use it anymore. "-Wunused-but-set-variable" in gcc-4.6 complains about this. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--diffcore-rename.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/diffcore-rename.c b/diffcore-rename.c
index d0259be..f639601 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -498,7 +498,7 @@ void diffcore_rename(struct diff_options *options)
struct diff_queue_struct outq;
struct diff_score *mx;
int i, j, rename_count, skip_unmodified = 0;
- int num_create, num_src, dst_cnt;
+ int num_create, dst_cnt;
struct progress *progress = NULL;
if (!minimum_score)
@@ -554,7 +554,6 @@ void diffcore_rename(struct diff_options *options)
* files still remain as options for rename/copies!)
*/
num_create = (rename_dst_nr - rename_count);
- num_src = rename_src_nr;
/* All done? */
if (!num_create)