{"thread":{"id":"16505","subject":"[PATCH 2/5] Name change: other -> commands.","startedAt":"2008-11-27T21:10:16Z","lastAt":"2008-11-28T01:27:01Z","messageCount":2,"participants":["William Pursell","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":5},"messages":[{"id":"96636","messageId":"492F0CB8.2080808@gmail.com","threadId":"16505","inReplyTo":null,"subject":"[PATCH 2/5] Name change: other -> commands.","fromName":"William Pursell","fromEmail":"bill.pursell@gmail.com","sentAt":"2008-11-27T21:10:16Z","receivedAt":"2008-11-27T21:10:16Z","isPatch":true,"sender":{"key":"bill.pursell@gmail.com","avatar":"https://gravatar.com/avatar/3ab4313e5dfdc1fedb65206d829ba33f71f56f26e11326979d1b99d5e1c403c9?d=mp&s=160"},"body":"\n\nThis name more accurately reflects the use of the variable.\n---\n  git-add--interactive.perl |   30 +++++++++++++++---------------\n  1 files changed, 15 insertions(+), 15 deletions(-)\n\ndiff --git a/git-add--interactive.perl b/git-add--interactive.perl\nindex 6e474d0..b530597 100755\n--- a/git-add--interactive.perl\n+++ b/git-add--interactive.perl\n@@ -878,8 +878,8 @@ sub patch_update_file {\n  \t$ix = 0;\n\n  \twhile (1) {\n-\t\tmy ($prev, $next, $other, $undecided, $i);\n-\t\t$other = 'ynad';\n+\t\tmy ($prev, $next, $commands, $undecided, $i);\n+\t\t$commands = 'ynad';\n\n  \t\tif ($num <= $ix) {\n  \t\t\t$ix = 0;\n@@ -887,22 +887,22 @@ sub patch_update_file {\n  \t\tfor ($i = 0; $i < $ix; $i++) {\n  \t\t\tif (!defined $hunk[$i]{USE}) {\n  \t\t\t\t$prev = 1;\n-\t\t\t\t$other .= 'k';\n+\t\t\t\t$commands .= 'k';\n  \t\t\t\tlast;\n  \t\t\t}\n  \t\t}\n  \t\tif ($ix) {\n-\t\t\t$other .= 'K';\n+\t\t\t$commands .= 'K';\n  \t\t}\n  \t\tfor ($i = $ix + 1; $i < $num; $i++) {\n  \t\t\tif (!defined $hunk[$i]{USE}) {\n  \t\t\t\t$next = 1;\n-\t\t\t\t$other .= 'j';\n+\t\t\t\t$commands .= 'j';\n  \t\t\t\tlast;\n  \t\t\t}\n  \t\t}\n  \t\tif ($ix < $num - 1) {\n-\t\t\t$other .= 'J';\n+\t\t\t$commands .= 'J';\n  \t\t}\n  \t\tfor ($i = 0; $i < $num; $i++) {\n  \t\t\tif (!defined $hunk[$i]{USE}) {\n@@ -913,14 +913,14 @@ sub patch_update_file {\n  \t\tlast if (!$undecided);\n\n  \t\tif (hunk_splittable($hunk[$ix]{TEXT})) {\n-\t\t\t$other .= 's';\n+\t\t\t$commands .= 's';\n  \t\t}\n-\t\t$other .= 'e?';\n+\t\t$commands .= 'e?';\n  \t\tfor (@{$hunk[$ix]{DISPLAY}}) {\n  \t\t\tprint;\n  \t\t}\n  \t\tprint colored $prompt_color, \"Stage this hunk [\" .\n-\t\t\t join (\",\", split( '', $other)) . \"]? \";\n+\t\t\t join (\",\", split( '', $commands)) . \"]? \";\n  \t\tmy $line = <STDIN>;\n  \t\tif ($line) {\n  \t\t\tif ($line =~ /^y/i) {\n@@ -947,15 +947,15 @@ sub patch_update_file {\n  \t\t\t\t}\n  \t\t\t\tnext;\n  \t\t\t}\n-\t\t\telsif ($other =~ /K/ && $line =~ /^K/) {\n+\t\t\telsif ($commands =~ /K/ && $line =~ /^K/) {\n  \t\t\t\t$ix--;\n  \t\t\t\tnext;\n  \t\t\t}\n-\t\t\telsif ($other =~ /J/ && $line =~ /^J/) {\n+\t\t\telsif ($commands =~ /J/ && $line =~ /^J/) {\n  \t\t\t\t$ix++;\n  \t\t\t\tnext;\n  \t\t\t}\n-\t\t\telsif ($other =~ /k/ && $line =~ /^k/) {\n+\t\t\telsif ($commands =~ /k/ && $line =~ /^k/) {\n  \t\t\t\twhile (1) {\n  \t\t\t\t\t$ix--;\n  \t\t\t\t\tlast if (!$ix ||\n@@ -963,7 +963,7 @@ sub patch_update_file {\n  \t\t\t\t}\n  \t\t\t\tnext;\n  \t\t\t}\n-\t\t\telsif ($other =~ /j/ && $line =~ /^j/) {\n+\t\t\telsif ($commands =~ /j/ && $line =~ /^j/) {\n  \t\t\t\twhile (1) {\n  \t\t\t\t\t$ix++;\n  \t\t\t\t\tlast if ($ix >= $num ||\n@@ -971,7 +971,7 @@ sub patch_update_file {\n  \t\t\t\t}\n  \t\t\t\tnext;\n  \t\t\t}\n-\t\t\telsif ($other =~ /s/ && $line =~ /^s/) {\n+\t\t\telsif ($commands =~ /s/ && $line =~ /^s/) {\n  \t\t\t\tmy @split = split_hunk($hunk[$ix]{TEXT}, $hunk[$ix]{DISPLAY});\n  \t\t\t\tif (1 < @split) {\n  \t\t\t\t\tprint colored $header_color, \"Split into \",\n@@ -988,7 +988,7 @@ sub patch_update_file {\n  \t\t\t\t}\n  \t\t\t}\n  \t\t\telse {\n-\t\t\t\thelp_patch_cmd($other);\n+\t\t\t\thelp_patch_cmd($commands);\n  \t\t\t\tnext;\n  \t\t\t}\n  \t\t\t# soft increment\n-- \n1.6.0.4.782.geea74.dirty\n\n\n-- \nWilliam Pursell\n"},{"id":"96664","messageId":"7vej0wabdm.fsf@gitster.siamese.dyndns.org","threadId":"16505","inReplyTo":"492F0CB8.2080808@gmail.com","subject":"Re: [PATCH 2/5] Name change: other -> commands.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-11-28T01:27:01Z","receivedAt":"2008-11-28T01:27:01Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"I see this needless churn.  Some commands are always available, so these\nare indeed other commands.\n"}]}