public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: Kaartic Sivaraam <kaarticsivaraam91196@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: Small issue with "add untracked" option of 'git add -i'
Date: Mon, 12 Jun 2017 10:59:07 -0700	[thread overview]
Message-ID: <xmqqshj5nl3o.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqwp8hnm1v.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Mon, 12 Jun 2017 10:38:36 -0700")

Junio C Hamano <gitster@pobox•com> writes:

> After prompting to get the list of desired files, if the user chose
> nothing, the message is shown.  "No untracked files chosen." is
> probably what the code wants to say, I would think.


Together with your other wishes, perhaps something like this is what
you have in mind.  The original tried to throw in a blank line as a
separator to help interactive users to more easily tell the boundary
of blocks of text, but it wasn't consistently doing so (e.g. "update"
when nothing is dirty was very silent, while "status" gave one blank
line that is supposed to be shown after the list of changed ones even
when the list is empty).

 git-add--interactive.perl | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 709a5f6ce6..0ec09361b4 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -537,7 +537,7 @@ sub list_and_choose {
 				$last_lf = 1;
 			}
 		}
-		if (!$last_lf) {
+		if (@stuff && !$last_lf) {
 			print "\n";
 		}
 
@@ -634,7 +634,6 @@ sub prompt_help_cmd {
 sub status_cmd {
 	list_and_choose({ LIST_ONLY => 1, HEADER => $status_head },
 			list_modified());
-	print "\n";
 }
 
 sub say_n_paths {
@@ -667,7 +666,6 @@ sub update_cmd {
 		       map { $_->{VALUE} } @update);
 		say_n_paths('updated', @update);
 	}
-	print "\n";
 }
 
 sub revert_cmd {
@@ -701,7 +699,6 @@ sub revert_cmd {
 		refresh();
 		say_n_paths('reverted', @update);
 	}
-	print "\n";
 }
 
 sub add_untracked_cmd {
@@ -711,9 +708,8 @@ sub add_untracked_cmd {
 		system(qw(git update-index --add --), @add);
 		say_n_paths('added', @add);
 	} else {
-		print __("No untracked files.\n");
+		print __("No untracked file chosen.\n");
 	}
-	print "\n";
 }
 
 sub run_git_apply {

next prev parent reply	other threads:[~2017-06-12 17:59 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-12 14:33 Small issue with "add untracked" option of 'git add -i' Kaartic Sivaraam
2017-06-12 17:38 ` Junio C Hamano
2017-06-12 17:58   ` Kaartic Sivaraam
2017-06-12 17:59   ` Junio C Hamano [this message]
2017-06-14 13:04     ` Kaartic Sivaraam
2017-06-15  6:50       ` Kaartic Sivaraam
2017-06-21  2:55     ` Kaartic Sivaraam
2017-06-21  4:52       ` Kevin Daudt
2017-06-21 12:05         ` Kaartic Sivaraam
2017-06-22  3:13     ` Kaartic Sivaraam

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:709a5f6ce dfblob:0ec09361b )
 OR (
bs:"Re: Small issue with "
bs:"add untracked"
bs:" option of 'git add -i'" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqshj5nl3o.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=kaarticsivaraam91196@gmail$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox