Sync with 1.8.0.1

diff --git a/builtin/reflog.c b/builtin/reflog.c
index 062d7dad1b5af720e70adcaa05b60bf68977b05c..b3c9e27bde653bf01acc6126deeb5f508fa0b26e 100644 (file)
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -330,8 +330,10 @@ static int expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
                printf("keep %s", message);
        return 0;
  prune:
-       if (!cb->newlog || cb->cmd->verbose)
-               printf("%sprune %s", cb->newlog ? "" : "would ", message);
+       if (!cb->newlog)
+               printf("would prune %s", message);
+       else if (cb->cmd->verbose)
+               printf("prune %s", message);
        return 0;
 }