Re: [PATCH 2/2] prune.c: only print informational message in show_only or verbose mode
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 7, 2012, 21:44 UTC
- Message-ID
- <7vlihqv0ks.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <20120807060311.GB13222@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
> I still think your 2/2 is worth doing independently, though. It is silly > that git-prune will not mention pruned objects without "-v", but will > mention temporary files. They should be in the same category.
Ok, so I'll queue it as a separate topic with a different justification.
-- >8 -- From: Brandon Casey <drafnel@gmail.com> Date: Mon, 6 Aug 2012 22:01:49 -0700 Subject: [PATCH] prune.c: only print informational message in show_only or verbose mode
"git prune" reports removal of loose object files that are no longer necessary only under the "-v" option, but unconditionally reports removal of temporary files that are no longer needed.
The original thinking was that presence of a leftover temporary file should be an unusual occurrence that may indicate an earlier failure of some sort, and the user may want to be reminded of it. Removing an unnecessary loose object file, on the other hand, is just part of the normal operation. That is why the former is always printed out and the latter only when -v is used.
But neither report is particularly useful. Hide both of these behind the "-v" option for consistency.
Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin/prune.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
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;
-- 1.7.12.rc2.53.g9ec2ef6