undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

subtree: don't let debug and progress output clash

Browse Source 
Currently, debug output (triggered by passing '-d') and progress output
stomp on each other.  The debug output is just streamed as lines to
stderr, and the progress output is sent to stderr as '%s\r'.  When
writing to a file, it is awkward to read and difficult to distinguish
between the debug output and a progress line.  When writing to a
terminal the debug lines hide progress lines.

So, when '-d' has been passed, spit out progress as 'progress: %s\n',
instead of as '%s\r', so that it can be detected, and so that the debug
lines don't overwrite the progress when written to a terminal.

Signed-off-by: Luke Shumaker <lukeshu@datawire.io>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Luke Shumaker 2021-04-27 15:17:42 -06:00 committed by Junio C Hamano
parent 5cdae0f6fd
commit 534ff90dbd
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
contrib/subtree/git-subtree.sh
View File

@ -67,7 +67,27 @@ debug () {
progress () {
if test -z "$GIT_QUIET"
then
printf "%s\r" "$*" >&2
if test -z "$arg_debug"
then
# Debug mode is off.
#
# Print one progress line that we keep updating (use
# "\r" to return to the beginning of the line, rather
# than "\n" to start a new line). This only really
# works when stderr is a terminal.
printf "%s\r" "$*" >&2
else
# Debug mode is on. The `debug` function is regularly
# printing to stderr.
#
# Don't do the one-line-with-"\r" thing, because on a
# terminal the debug output would overwrite and hide the
# progress output. Add a "progress:" prefix to make the
# progress output and the debug output easy to
# distinguish. This ensures maximum readability whether
# stderr is a terminal or a file.
printf "progress: %s\n" "$*" >&2
fi
fi
}