diff options
| author |  Dan McGee <dpmcgee@gmail.com> | 2011-03-27 20:32:19 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-04-03 10:59:40 -0700 |
| commit | 13ee1384ef0004bd9fa6e4d2b832b49ce2e8a032 (patch) | |
| tree | abcdf39c80b8c2b3218e01bf764da1b0e141bf4d /merge-recursive.c | |
| parent | Remove old binaries from .gitignore (diff) | |
| download | tgif-13ee1384ef0004bd9fa6e4d2b832b49ce2e8a032.tar.xz | |
Fix two unused variable warnings in gcc 4.6
Seen with -Wunused-but-set-variable.
Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 8e82a8b1a5..af131508ec 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -356,7 +356,6 @@ static void make_room_for_directories_of_df_conflicts(struct merge_options *o, */ const char *last_file = NULL; int last_len = 0; - struct stage_data *last_e; int i; for (i = 0; i < entries->nr; i++) { @@ -386,7 +385,6 @@ static void make_room_for_directories_of_df_conflicts(struct merge_options *o, if (S_ISREG(e->stages[2].mode) || S_ISLNK(e->stages[2].mode)) { last_file = path; last_len = len; - last_e = e; } else { last_file = NULL; } @@ -961,7 +959,6 @@ static int process_renames(struct merge_options *o, } for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) { - char *src; struct string_list *renames1, *renames2Dst; struct rename *ren1 = NULL, *ren2 = NULL; const char *branch1, *branch2; @@ -996,7 +993,6 @@ static int process_renames(struct merge_options *o, ren2 = ren1; ren1 = tmp; } - src = ren1->pair->one->path; ren1->dst_entry->processed = 1; ren1->src_entry->processed = 1; |