prune.c: only print informational message in show_only or verbose mode
authorBrandon Casey <drafnel@gmail.com>
Tue, 7 Aug 2012 05:01:49 +0000 (22:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 7 Aug 2012 22:01:37 +0000 (15:01 -0700)
"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 the 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
index b99b635e44f6145395b5c761505099c0a0f5b6cc..6cb99443c1a1773b6a8207dfbcc6d1e053e70ce4 100644 (file)
@@ -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;