<p>This makes a couple of related changes to '%autosetup -S git' to make<br>
debugging using the rpm build dir as a git worktree significantly<br>
easier:</p>
<ul>
<li>creates a branch named "rpmbuild" at the initial commit, switches to<br>
it, and sets the branch's upstream to master so that in the work tree<br>
things like "git rebase -i" have a default behavior that makes sense</li>
<li>introduces the optional _<em>scm_apply_patches</em>%{__scm}, which if defined<br>
will be called to apply all patches at once.  The patches are not<br>
provided as an argument, %{patches} must be used.  This allows a<br>
developer debugging a package to use "git am --continue" in the<br>
work tree after one patch fails, so the developer can continue fixing<br>
all the patches up at once and regenerate the patchset with<br>
"git format-patch" when they finish.</li>
<li>introduces __scm_apply_git_am_options and uses it for both<br>
%__scm_apply_git_am and %__scm_apply_patches_git_am .  By default,<br>
this is populated with three options:<br>
--ignore-whitespace<br>
this makes whitespace discrepancies in diff context be ignored<br>
--whitespace=nowarn<br>
this makes whitespace issues in the patch itself, such as trailing<br>
whitespace, be ignored<br>
--committer-date-is-author-date<br>
this makes the date of the commit be the date from the patch, not<br>
the date rpmbuild is run</li>
</ul>
<p>Signed-off-by: Peter Jones <a href="mailto:pjones@redhat.com">pjones@redhat.com</a></p>

<hr>

<h4>You can view, comment on, or merge this pull request online at:</h4>
<p>  <a href='https://github.com/rpm-software-management/rpm/pull/854'>https://github.com/rpm-software-management/rpm/pull/854</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Improve "git am" support.</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/rpm-software-management/rpm/pull/854/files#diff-0">macros.in</a>
    (15)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/rpm-software-management/rpm/pull/854.patch'>https://github.com/rpm-software-management/rpm/pull/854.patch</a></li>
  <li><a href='https://github.com/rpm-software-management/rpm/pull/854.diff'>https://github.com/rpm-software-management/rpm/pull/854.diff</a></li>
</ul>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/rpm-software-management/rpm/pull/854?email_source=notifications&email_token=ADLPZU6NPHJTF3RQJKVUXS3QLEBABA5CNFSM4IZOBKH2YY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HNDM3XQ">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ADLPZU5V5V3ZLEQ6EXRN5TLQLEBABANCNFSM4IZOBKHQ">mute the thread</a>.<img src="https://github.com/notifications/beacon/ADLPZU2ZWXOAZIYVL6BZNT3QLEBABA5CNFSM4IZOBKH2YY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HNDM3XQ.gif" height="1" width="1" alt="" /></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/rpm-software-management/rpm/pull/854?email_source=notifications\u0026email_token=ADLPZU6NPHJTF3RQJKVUXS3QLEBABA5CNFSM4IZOBKH2YY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HNDM3XQ",
"url": "https://github.com/rpm-software-management/rpm/pull/854?email_source=notifications\u0026email_token=ADLPZU6NPHJTF3RQJKVUXS3QLEBABA5CNFSM4IZOBKH2YY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HNDM3XQ",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>