Skip to content

Commit

Permalink
t5570: Update for clone-progress-to-stderr branch
Browse files Browse the repository at this point in the history
git clone now reports its progress to standard error, which throws off
t5570.  Using test_i18ngrep instead of test_cmp allows the test to be
more flexible by only looking for the expected error and ignoring any
other output from the program.

Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Brian Gernhardt authored and Junio C Hamano committed Oct 30, 2013
1 parent dcb11cc commit d619cfc
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions t/t5570-git-daemon.sh
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,7 @@ test_remote_error()
fi

test_must_fail git "$cmd" "$GIT_DAEMON_URL/$repo" "$@" 2>output &&
echo "fatal: remote error: $msg: /$repo" >expect &&
test_cmp expect output
test_i18ngrep "fatal: remote error: $msg: /$repo" output &&
ret=$?
chmod +x "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git"
(exit $ret)
Expand Down

0 comments on commit d619cfc

Please sign in to comment.