[PATCH] Honor git-reset -q by silencing progress updates.

[PATCH] Honor git-reset -q by silencing progress updates.

[Jamis Buck]

[-- Attachment #1: Type: text/plain, Size: 1640 bytes --]

When running git-reset in a non-interactive setting, the -q switch
works for everything except the progress updates. This patch attempts
to extend the application of -q to suppress that, too.
---
builtin-reset.c |    9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/builtin-reset.c b/builtin-reset.c
index e32ddd9..3810f6d 100644
--- a/builtin-reset.c
+++ b/builtin-reset.c
@@ -49,13 +49,14 @@ static inline int is_merge(void)
	return !access(git_path("MERGE_HEAD"), F_OK);
}

-static int reset_index_file(const unsigned char *sha1, int  
is_hard_reset)
+static int reset_index_file(const unsigned char *sha1, int  
is_hard_reset, int quiet)
{
	int i = 0;
	const char *args[6];

	args[i++] = "read-tree";
-	args[i++] = "-v";
+	if (!quiet)
+		args[i++] = "-v";
	args[i++] = "--reset";
	if (is_hard_reset)
		args[i++] = "-u";
@@ -182,7 +183,7 @@ int cmd_reset(int argc, const char **argv, const  
char *prefix)
		OPT_SET_INT(0, "hard", &reset_type,
				"reset HEAD, index and working tree", HARD),
		OPT_BOOLEAN('q', NULL, &quiet,
-				"disable showing new HEAD in hard reset"),
+				"disable progress and showing new HEAD in hard reset"),
		OPT_END()
	};

@@ -231,7 +232,7 @@ int cmd_reset(int argc, const char **argv, const  
char *prefix)
		if (is_merge() || read_cache() < 0 || unmerged_cache())
			die("Cannot do a soft reset in the middle of a merge.");
	}
-	else if (reset_index_file(sha1, (reset_type == HARD)))
+	else if (reset_index_file(sha1, (reset_type == HARD), quiet))
		die("Could not reset index file to revision '%s'.", rev);

	/* Any resets update HEAD to the head being switched to,
-- 
1.5.5.1


[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 2421 bytes --]

Re: [PATCH] Honor git-reset -q by silencing progress updates.

[Junio C Hamano]

Jamis Buck <jamis@37signals.com> writes:

> --Apple-Mail-10--112802933
> Content-Type: text/plain;
> 	charset=US-ASCII;
> 	format=flowed;
> 	delsp=yes
> Content-Transfer-Encoding: 7bit

Please do not do unnecessary S/MIME nor format=flawed.  It makes reviewing
and application of the patches inconvenient.

>
> When running git-reset in a non-interactive setting, the -q switch
> works for everything except the progress updates. This patch attempts
> to extend the application of -q to suppress that, too.
> ---
> builtin-reset.c |    9 +++++----
> 1 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/builtin-reset.c b/builtin-reset.c
> index e32ddd9..3810f6d 100644
> --- a/builtin-reset.c
> +++ b/builtin-reset.c
> @@ -49,13 +49,14 @@ static inline int is_merge(void)
> 	return !access(git_path("MERGE_HEAD"), F_OK);
> }
>
> -static int reset_index_file(const unsigned char *sha1, int  
> is_hard_reset)
> +static int reset_index_file(const unsigned char *sha1, int  
> is_hard_reset, int quiet)
> {