red-hat-storage / rhcephpkg

93%

master: 94%

LAST BUILD ON BRANCH patch-check-patches

branch: patch-check-patches

CHANGE BRANCH

x

Reset

• patch-check-patches
• add-stickler-config
• build-log-pq-branch
• clone-python-names
• delete-patches
• docs
• email-env
• failed-builds-exit-1
• git-helper-conftest
• gitbz
• global-ca-store
• hello-jenkins-url
• keyboardinterrupt-queued-build
• master
• merge-patches-ensure-pq
• new-version
• new-version-fixes
• new-version-fixtures
• new-version-upstream-branches
• optimize-setup-pristine-tar
• patch-check-changes
• patch-describe-add
• patch-refactor
• patch-require-bzs
• pytest-4.1
• pytest-flake8
• python-jenkins-1.0.0
• releasing-clarify-copy
• releasing-dput-output
• rename-patch-queue-vars
• rhcephpkg-logger
• test-download-main
• test-hello-fixes
• test-localbuild-testpkg
• test-merge-patches-help
• test-source-help
• tests-pkg
• tests-source-variable
• travis-xenial
• travisci-install
• trusty-bionic
• util-doc-current-branch
• util-gbp-has-pristine-tar-branch
• util-test-cleanup
• v1.0.3
• v1.10.0
• v1.11.0
• v1.12.0
• v1.13.0
• v1.2.0
• v1.2.1
• v1.3.0
• v1.4.0
• v1.5.0
• v1.5.1
• v1.5.2
• v1.6.0
• v1.7.0
• v1.7.1
• v1.7.2
• v1.8.0
• v1.9.0
• version-1.2.0
• watch-build-exit-non-zero

Build # 446

Build Type

push

travis-ci

Committed by ktdreyer

Commit Message

patch: improve check for modified .patch files

If a project has a .gitignore file that ignores new .patch files in the
tree, `rhcephpkg patch` will write new .patch files locally but fail to
commit them to dist-git. The debian/changelog bump is there, and the
debian/patches/series file change is there, but the .patch files
themselves are missing from the Git commit.

Before `rhcephpkg patch` does the Git commit, it calls
read_git_debian_patches_status() as a pre-flight sanity-check in order
to verify that some .patch file has changed.

Prior to this commit, read_git_debian_patches_status() would return any
change to the debian/patches/series file as well as any .patch files.
This means that the pre-flight check would pass, even if Git was not
going to commit the .patch files themselves.

Make read_git_debian_patches_status() explicitly check for .patch file
changes (implicitly ignoring the debian/patches/series file changes).

This will lead `rhcephpkg patch` to quit with an error if a .gitignore
file happens to be ignoring .patch files.

Run Details

709 of 759 relevant lines covered (93.41%)

3.7 hits per line