Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix pull creation with empty changes #7920

Merged
merged 3 commits into from Aug 20, 2019

Conversation

@typeless
Copy link
Contributor

commented Aug 20, 2019

Fixes #6870

  • Log the stderr of git-apply
  • Add an integration test
  • Skip testPatch when patch is empty

@typeless typeless force-pushed the typeless:pull-with-empty-changes branch from 110b0ce to 60703a2 Aug 20, 2019

@typeless typeless changed the title Test pull creation with empty changes Fix pull creation with empty changes Aug 20, 2019

Fix pull creation with empty changes
* Logs the stderr of git-apply
* Add an integration test
* Skip testPatch when patch is empty

@typeless typeless force-pushed the typeless:pull-with-empty-changes branch from 60703a2 to 58aace8 Aug 20, 2019

@typeless

This comment has been minimized.

Copy link
Contributor Author

commented Aug 20, 2019

The CI failure seems to be unrelated to the change. 🤔

@codecov-io

This comment has been minimized.

Copy link

commented Aug 20, 2019

Codecov Report

❗️ No coverage uploaded for pull request base (master@8c10d91). Click here to learn what that means.
The diff coverage is 33.33%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #7920   +/-   ##
=========================================
  Coverage          ?   41.45%           
=========================================
  Files             ?      478           
  Lines             ?    63945           
  Branches          ?        0           
=========================================
  Hits              ?    26506           
  Misses            ?    33990           
  Partials          ?     3449
Impacted Files Coverage Δ
models/pull.go 55.31% <33.33%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8c10d91...9e7b4c2. Read the comment docs.

@lunny
lunny approved these changes Aug 20, 2019

@GiteaBot GiteaBot added lgtm/need 1 and removed lgtm/need 2 labels Aug 20, 2019

@GiteaBot GiteaBot added lgtm/done and removed lgtm/need 1 labels Aug 20, 2019

@lafriks lafriks added this to the 1.10.0 milestone Aug 20, 2019

@techknowlogick techknowlogick merged commit 3ac45e3 into go-gitea:master Aug 20, 2019

1 check passed

continuous-integration/drone/pr Build is passing
Details

@lunny lunny added the backport/v1.9 label Aug 21, 2019

@lunny

This comment has been minimized.

Copy link
Member

commented Aug 21, 2019

@typeless please also send a back port to v1.9

typeless added a commit to typeless/gitea that referenced this pull request Aug 21, 2019
Fix pull creation with empty changes (go-gitea#7920)
* Logs the stderr of git-apply
* Add an integration test
* Skip testPatch when patch is empty
@typeless

This comment has been minimized.

Copy link
Contributor Author

commented Aug 21, 2019

@lunny Done. #7926

@lunny lunny added the backport/done label Aug 21, 2019

techknowlogick added a commit that referenced this pull request Aug 21, 2019
Fix pull creation with empty changes (#7920) (#7926)
* Logs the stderr of git-apply
* Add an integration test
* Skip testPatch when patch is empty
aswild added a commit to aswild/gitea that referenced this pull request Aug 25, 2019
Merge tag 'v1.9.2' into wild/v1.9
* BUGFIXES
  * Fix wrong sender when send slack webhook (go-gitea#7918) (go-gitea#7924)
  * Upload support text/plain; charset=utf8 (go-gitea#7899)
  * Lfs/lock: round locked_at timestamp to second (go-gitea#7872) (go-gitea#7875)
  * Fix non existent milestone with 500 error (go-gitea#7867) (go-gitea#7873)
* SECURITY
  * Fix No PGP signature on 1.9.1 tag (go-gitea#7874)
  * Release built with go 1.12.9 to fix security fixes in golang std lib, ref: https://groups.google.com/forum/#!msg/golang-announce/oeMaeUnkvVE/a49yvTLqAAAJ
* ENHANCEMENT
  * Fix pull creation with empty changes (go-gitea#7920) (go-gitea#7926)
* BUILD
  * Drone/docker: prepare multi-arch release + provide arm64 image (go-gitea#7571) (go-gitea#7884)

@typeless typeless deleted the typeless:pull-with-empty-changes branch Aug 28, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
6 participants
You can’t perform that action at this time.