Status: New
Owner: ----
Labels: Type-Defect Priority-Medium
New issue 2494 by [email protected]: manually uploaded git diff-tree
--cc produce 'diff file is empty'
http://code.google.com/p/reviewboard/issues/detail?id=2494
What version are you running?
bleeding edge, c848031b769cf84b8f9fe42430210459735fed11
What's the URL of the page containing the problem?
rbtools post-review
What steps will reproduce the problem?
1. generate a diff of a merge commit with --cc. {you can just do git show
COMMIT --format=format:'' > out.diff}
2. post-review it
What is the expected output?
the diff to be posted to reviewboard
What do you see instead?
git@source:~/repositories/repo.git$ post-review \
--publish \
--debug \
--username="git" \
--password="git" \
--diff-filename="/tmp/diff_eaca7ff" \
--server="https://site.com/reviewboard"; \
--branch="master" \
--description="Merge branch 'feature' into master\nConflicts:\nsrc/file" \
--summary="eaca7ff (JAVA) Merge branch 'point/5.0.26' into develop" \
| tee -a post-review.log
Error uploading diff
The generated diff file was empty. This usually means no files were
modified in this change.
Try running with --output-diff and --debug for more information.
RBTools 0.4 alpha 0 (dev)
Home = /opt/git
HTTP GETting api/
HTTP GETting https://site.com/reviewboard/api/info/
Using the new web API
Attempting to create review request on /opt/git/repositories/repo.git
for None
HTTP POSTing to https://site.com/reviewboard/api/review-requests/:
{'repository': '/opt/git/repositories/repo.git'}
Review request created
Attempting to set field 'summary' to 'eaca7ff (JAVA) Merge
branch 'point/5.0.26' into develop'
HTTP PUTting to
https://site.com/reviewboard/api/review-requests/6953/draft/:
{'summary': "eaca7ff (JAVA) Merge branch 'point/5.0.26' into develop"}
Attempting to set field 'branch' to 'master' for review request '6953'
HTTP PUTting to
https://site.com/reviewboard/api/review-requests/6953/draft/:
{'branch': 'master'}
Attempting to set field 'description' to 'Merge branch 'feature' into
master\nConflicts:\nsrc/file'
HTTP PUTting to
https://site.com/reviewboard/api/review-requests/6953/draft/:
{'description': "Merge branch 'feature' into
master\nConflicts:\nsrc/file"}
Uploading diff, size: 5873
HTTP POSTing to
https://site.com/reviewboard/api/review-requests/6953/diffs/: {}
Got API Error 105 (HTTP code 400): One or more fields had errors
Error data: {u'fields': {u'path': [u'The diff file is empty']},
u'stat': u'fail', u'err': {u'msg': u'One or more fields had errors',
u'code': 105}}
Your review request still exists, but the diff is not attached.
What operating system are you using? What browser?
centos/firefox
more info:
scrubbed a few things. note that the diff size is 5873 bytes, and that this
works when the diff is any git diff aside from diff --cc.
--
You received this message because you are subscribed to the Google Groups
"reviewboard-issues" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/reviewboard-issues?hl=en.
