git add -i: Remove unused variables

Signed-off-by: Jean-Luc Herren <jlh@gmx.ch>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 15b3f5b36c78978ce7165c46ec7b6539e260f0a4..ac598f88e62fc8f48aaaac8376ccde63cb3e2643 100755 (executable)
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -374,9 +374,8 @@ sub split_hunk {
        # it can be split, but we would need to take care of
        # overlaps later.
 
        # it can be split, but we would need to take care of
        # overlaps later.
 

-       my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) = parse_hunk_header($text->[0]);
+       my ($o_ofs, undef, $n_ofs) = parse_hunk_header($text->[0]);

        my $hunk_start = 1;
        my $hunk_start = 1;

-       my $next_hunk_start;

 
       OUTER:
        while (1) {
 
       OUTER:
        while (1) {


@@ -443,8 +442,8 @@ sub split_hunk {
        for my $hunk (@split) {
                $o_ofs = $hunk->{OLD};
                $n_ofs = $hunk->{NEW};
        for my $hunk (@split) {
                $o_ofs = $hunk->{OLD};
                $n_ofs = $hunk->{NEW};

-               $o_cnt = $hunk->{OCNT};
-               $n_cnt = $hunk->{NCNT};
+               my $o_cnt = $hunk->{OCNT};
+               my $n_cnt = $hunk->{NCNT};

 
                my $head = ("@@ -$o_ofs" .
                            (($o_cnt != 1) ? ",$o_cnt" : '') .
 
                my $head = ("@@ -$o_ofs" .
                            (($o_cnt != 1) ? ",$o_cnt" : '') .


@@ -459,7 +458,7 @@ sub split_hunk {
 sub find_last_o_ctx {
        my ($it) = @_;
        my $text = $it->{TEXT};
 sub find_last_o_ctx {
        my ($it) = @_;
        my $text = $it->{TEXT};

-       my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) = parse_hunk_header($text->[0]);
+       my ($o_ofs, $o_cnt) = parse_hunk_header($text->[0]);

        my $i = @{$text};
        my $last_o_ctx = $o_ofs + $o_cnt;
        while (0 < --$i) {
        my $i = @{$text};
        my $last_o_ctx = $o_ofs + $o_cnt;
        while (0 < --$i) {


@@ -531,8 +530,7 @@ sub coalesce_overlapping_hunks {
 
        for (grep { $_->{USE} } @in) {
                my $text = $_->{TEXT};
 
        for (grep { $_->{USE} } @in) {
                my $text = $_->{TEXT};

-               my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) =
-                   parse_hunk_header($text->[0]);
+               my ($o_ofs) = parse_hunk_header($text->[0]);

                if (defined $last_o_ctx &&
                    $o_ofs <= $last_o_ctx) {
                        merge_hunk($out[-1], $_);
                if (defined $last_o_ctx &&
                    $o_ofs <= $last_o_ctx) {
                        merge_hunk($out[-1], $_);


@@ -699,7 +697,7 @@ sub patch_update_cmd {
 
        @hunk = coalesce_overlapping_hunks(@hunk);
 
 
        @hunk = coalesce_overlapping_hunks(@hunk);
 

-       my ($o_lofs, $n_lofs) = (0, 0);
+       my $n_lofs = 0;

        my @result = ();
        for (@hunk) {
                my $text = $_->{TEXT};
        my @result = ();
        for (@hunk) {
                my $text = $_->{TEXT};


@@ -806,8 +804,6 @@ sub main_loop {
        }
 }
 
        }
 }
 

-my @z;
-

 refresh();
 status_cmd();
 main_loop();
 refresh();
 status_cmd();
 main_loop();