Merge branch 'bc/prune-info'

Teach "git prune" without "-v" to be silent about leftover temporary files. * bc/prune-info: prune.c: only print informational message in show_only or verbose mode
git-mirror · Aug 29, 2012 · b49203b · b49203b
2 parents 8748f3c + 90b29cb
commit b49203b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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;