Skip to content

Commit ec9589f

Browse files
author
vrana
committed
Ignore errors in svn diff
Summary: Otherwise attaching the commit diff doesn't work. Test Plan: Reparsed previously failing commit message. Reviewers: epriestley Reviewed By: epriestley CC: aran, Koolvin Differential Revision: https://secure.phabricator.com/D2605
1 parent 7978264 commit ec9589f

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed
+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/sh
2+
3+
diff "$@"
4+
if [ "$?" = "2" ]; then
5+
exit 1
6+
fi

src/applications/diffusion/query/rawdiff/DiffusionSvnRawDiffQuery.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ protected function executeQuery() {
2323
$repository = $drequest->getRepository();
2424

2525
$commit = $drequest->getCommit();
26+
$root = phutil_get_library_root('phabricator');
2627

2728
$future = $repository->getRemoteCommandFuture(
28-
'diff --diff-cmd diff -x -U%d -c %d %s%s@',
29+
'diff --diff-cmd %s -x -U%d -c %d %s%s@',
30+
$root.'/../scripts/repository/binary_safe_diff.sh',
2931
$this->getLinesOfContext(),
3032
$commit,
3133
$repository->getRemoteURI(),

0 commit comments

Comments
 (0)