[PATCH 1/5] Change separator from '/' to ',' in add --patch

From

William Pursell <bill.pursell@gmail.com>

Date

Nov 27, 2008, 21:10 UTC

Message-ID

<492F0CB3.7010506@gmail.com>

This also simplifies the code some by localizing the
separator to the join at line 923.
---
  git-add--interactive.perl |   17 +++++++++--------
  1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index b0223c3..6e474d0 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -879,7 +879,7 @@ sub patch_update_file {

  	while (1) {
  		my ($prev, $next, $other, $undecided, $i);
-		$other = '';
+		$other = 'ynad';

  		if ($num <= $ix) {
  			$ix = 0;
@@ -887,22 +887,22 @@ sub patch_update_file {
  		for ($i = 0; $i < $ix; $i++) {
  			if (!defined $hunk[$i]{USE}) {
  				$prev = 1;
-				$other .= '/k';
+				$other .= 'k';
  				last;
  			}
  		}
  		if ($ix) {
-			$other .= '/K';
+			$other .= 'K';
  		}
  		for ($i = $ix + 1; $i < $num; $i++) {
  			if (!defined $hunk[$i]{USE}) {
  				$next = 1;
-				$other .= '/j';
+				$other .= 'j';
  				last;
  			}
  		}
  		if ($ix < $num - 1) {
-			$other .= '/J';
+			$other .= 'J';
  		}
  		for ($i = 0; $i < $num; $i++) {
  			if (!defined $hunk[$i]{USE}) {
@@ -913,13 +913,14 @@ sub patch_update_file {
  		last if (!$undecided);

  		if (hunk_splittable($hunk[$ix]{TEXT})) {
-			$other .= '/s';
+			$other .= 's';
  		}
-		$other .= '/e';
+		$other .= 'e?';
  		for (@{$hunk[$ix]{DISPLAY}}) {
  			print;
  		}
-		print colored $prompt_color, "Stage this hunk [y/n/a/d$other/?]? ";
+		print colored $prompt_color, "Stage this hunk [" .
+			 join (",", split( '', $other)) . "]? ";
  		my $line = <STDIN>;
  		if ($line) {
  			if ($line =~ /^y/i) {

-- 
1.6.0.4.782.geea74.dirty


-- 
William Pursell