Signed-off-by: Alex Riesen <raa.lkml@xxxxxxxxx>
---
I was wondering about why git-reset --hard now prints an empty
line between the command and the oneline commit description.
progress.c | 6 +++++-
progress.h | 1 +
2 files changed, 6 insertions(+), 1 deletions(-)
From 139c597fecbb9ddf18c47b12cc97c42763a133bf Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@xxxxxxxxx>
Date: Wed, 23 May 2007 17:55:28 +0200
Subject: [PATCH] Fix the progress code to output LF only when it is really needed
Signed-off-by: Alex Riesen <raa.lkml@xxxxxxxxx>
---
progress.c | 6 +++++-
progress.h | 1 +
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/progress.c b/progress.c
index 05f7890..4344f4e 100644
--- a/progress.c
+++ b/progress.c
@@ -62,11 +62,13 @@ int display_progress(struct progress *progress, unsigned n)
fprintf(stderr, "%s%4u%% (%u/%u) done\r",
progress->prefix, percent, n, progress->total);
progress_update = 0;
+ progress->need_lf = 1;
return 1;
}
} else if (progress_update) {
fprintf(stderr, "%s%u\r", progress->prefix, n);
progress_update = 0;
+ progress->need_lf = 1;
return 1;
}
return 0;
@@ -80,6 +82,7 @@ void start_progress(struct progress *progress, const char *title,
progress->total = total;
progress->last_percent = -1;
progress->delay = 0;
+ progress->need_lf = 0;
if (snprintf(buf, sizeof(buf), title, total))
fprintf(stderr, "%s\n", buf);
set_progress_signal();
@@ -95,12 +98,13 @@ void start_progress_delay(struct progress *progress, const char *title,
progress->delayed_percent_treshold = percent_treshold;
progress->delayed_title = title;
progress->delay = delay;
+ progress->need_lf = 0;
set_progress_signal();
}
void stop_progress(struct progress *progress)
{
clear_progress_signal();
- if (progress->total)
+ if (progress->need_lf)
fputc('\n', stderr);
}
diff --git a/progress.h b/progress.h
index 5ae1a89..a7c17ca 100644
--- a/progress.h
+++ b/progress.h
@@ -8,6 +8,7 @@ struct progress {
unsigned delay;
unsigned delayed_percent_treshold;
const char *delayed_title;
+ int need_lf;
};
int display_progress(struct progress *progress, unsigned n);
--
1.5.2.787.g56770
