git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Brandon Casey <drafnel@gmail.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, Brandon Casey <drafnel@gmail.com>
Subject: [PATCH 2/2] prune.c: only print informational message in show_only or verbose mode
Date: Mon,  6 Aug 2012 22:01:49 -0700	[thread overview]
Message-ID: <1344315709-15897-2-git-send-email-drafnel@gmail.com> (raw)
In-Reply-To: <1344315709-15897-1-git-send-email-drafnel@gmail.com>

This informational message can cause a problem if 'git prune' is spawned
from an auto-gc during receive-pack.  In this case, the informational
message will be sent back over the wire to the git client and the client
will try to interpret it as part of the pack protocol and will produce an
error.

So let's refrain from producing this message unless show_only or verbose
is enabled.

This fixes the test in t5400.

Signed-off-by: Brandon Casey <drafnel@gmail.com>
---
 builtin/prune.c      | 3 ++-
 t/t5400-send-pack.sh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/builtin/prune.c b/builtin/prune.c
index b99b635..6cb9944 100644
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -25,7 +25,8 @@ static int prune_tmp_object(const char *path, const char *filename)
 		return error("Could not stat '%s'", fullpath);
 	if (st.st_mtime > expire)
 		return 0;
-	printf("Removing stale temporary file %s\n", fullpath);
+	if (show_only || verbose)
+		printf("Removing stale temporary file %s\n", fullpath);
 	if (!show_only)
 		unlink_or_warn(fullpath);
 	return 0;
diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 04a8791..250c720 100755
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -145,7 +145,7 @@ test_expect_success 'push --all excludes remote-tracking hierarchy' '
 	)
 '
 
-test_expect_failure 'receive-pack runs auto-gc in remote repo' '
+test_expect_success 'receive-pack runs auto-gc in remote repo' '
 	rm -rf parent child &&
 	git init parent &&
 	(
-- 
1.7.12.rc1.17.g9a7365c

  reply	other threads:[~2012-08-07  5:02 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-05  1:55 Did we break receive-pack recently? Junio C Hamano
2012-08-06  1:37 ` Brandon Casey
2012-08-06  3:32   ` Brandon Casey
2012-08-07  5:01     ` [PATCH 1/2] t/t5400: demonstrate breakage caused by informational message from prune Brandon Casey
2012-08-07  5:01       ` Brandon Casey [this message]
2012-08-07  5:28         ` [PATCH 2/2] prune.c: only print informational message in show_only or verbose mode Junio C Hamano
2012-08-07  5:34           ` Junio C Hamano
2012-08-07  5:44             ` Brandon Casey
2012-08-07  6:03               ` Jeff King
2012-08-07  6:33                 ` Brandon Casey
2012-08-07 15:41                   ` Junio C Hamano
2012-08-07 21:44                 ` Junio C Hamano
2012-08-07 21:59                   ` Jeff King
2012-08-07 22:55                   ` Brandon Casey
2012-08-07  5:32         ` Jeff King

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=1344315709-15897-2-git-send-email-drafnel@gmail.com \
    --to=drafnel@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

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

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).