On Mon, Mar 28, 2011 at 8:05 AM, Joshua Juran <jjuran@xxxxxxxxx> wrote:
> On Mar 27, 2011, at 6:32 PM, Dan McGee wrote:
>
>> diff --git a/http-fetch.c b/http-fetch.c
>> index 923904f..3af4c71 100644
>> --- a/http-fetch.c
>> +++ b/http-fetch.c
>> @@ -8,7 +8,6 @@ static const char http_fetch_usage[] = "git http-fetch "
>>
>> int main(int argc, const char **argv)
>> {
>> - Â Â Â const char *prefix;
>> Â Â Â Âstruct walker *walker;
>> Â Â Â Âint commits_on_stdin = 0;
>> Â Â Â Âint commits;
>> diff --git a/merge-recursive.c b/merge-recursive.c
>> index 8e82a8b..af13150 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++) {
>> @@ -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;
>
> Looks like three unused variables, not two.
You are correct, my lack of caffeine can be blamed for the misleading
message. I didn't think it was important enough to resubmit for that
though.
-Dan
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html