This makes a couple of related changes to '%autosetup -S git' to make
debugging using the rpm build dir as a git worktree significantly
easier:
- creates a branch named "rpmbuild" at the initial commit, switches to
it, and sets the branch's upstream to master so that in the work tree
things like "git rebase -i" have a default behavior that makes sense
- introduces the optional __scm_apply_patches_%{__scm}, which if defined
will be called to apply all patches at once. The patches are not
provided as an argument, %{patches} must be used. This allows a
developer debugging a package to use "git am --continue" in the
work tree after one patch fails, so the developer can continue fixing
all the patches up at once and regenerate the patchset with
"git format-patch" when they finish.
- introduces __scm_apply_git_am_options and uses it for both
%__scm_apply_git_am and %__scm_apply_patches_git_am . By default,
this is populated with three options:
--ignore-whitespace
this makes whitespace discrepancies in diff context be ignored
--whitespace=nowarn
this makes whitespace issues in the patch itself, such as trailing
whitespace, be ignored
--committer-date-is-author-date
this makes the date of the commit be the date from the patch, not
the date rpmbuild is run
Signed-off-by: Peter Jones <pjo...@redhat.com>
You can view, comment on, or merge this pull request online at:
https://github.com/rpm-software-management/rpm/pull/854
-- Commit Summary --
* Improve "git am" support.
-- File Changes --
M macros.in (15)
-- Patch Links --
https://github.com/rpm-software-management/rpm/pull/854.patch
https://github.com/rpm-software-management/rpm/pull/854.diff
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/854
_______________________________________________
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint
