Skip to content
Snippets Groups Projects
Commit 4c44810d authored by Shawn Pearce's avatar Shawn Pearce
Browse files

Use more restrictive patterns for sideband progress scraping


To avoid scraping a non-progress message as though it were a progress
item for the progress monitor, use a more restrictive pattern to
watch the remote side's messages.  These two regexps should match
any message produced by C Git since 42e18fbf5f94 ("more compact
progress display", Oct 2007), and which first appeared in Git 1.5.4.

Change-Id: I57e34cf59d42c1dbcbd1a83dd6f499ce5e39d15d
Signed-off-by: default avatarShawn O. Pearce <spearce@spearce.org>
parent 3a9295b8
No related branches found
No related tags found
No related merge requests found
......@@ -82,11 +82,11 @@ class SideBandInputStream extends InputStream {
static final int CH_ERROR = 3;
private static Pattern P_UNBOUNDED = Pattern.compile(
"^([\\w ]+): (\\d+)( |, done)?.*", Pattern.DOTALL);
private static Pattern P_UNBOUNDED = Pattern
.compile("^([\\w ]+): +(\\d+)(?:, done\\.)? *$");
private static Pattern P_BOUNDED = Pattern.compile(
"^([\\w ]+):.*\\((\\d+)/(\\d+)\\).*", Pattern.DOTALL);
private static Pattern P_BOUNDED = Pattern
.compile("^([\\w ]+): +\\d+% +\\( *(\\d+)/ *(\\d+)\\)(?:, done\\.)? *$");
private final InputStream rawIn;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment