Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 857859 Details for
Bug 1059285
rpm: __scm_apply_git macro should use --index for git apply and omit -a for git commit
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
Try git am before git apply
0001-Try-git-am-before-trying-git-apply-for-autosetup-RhB.patch (text/plain), 955 bytes, created by
Stanislav Ochotnicky
on 2014-01-31 13:43:17 UTC
(
hide
)
Description:
Try git am before git apply
Filename:
MIME Type:
Creator:
Stanislav Ochotnicky
Created:
2014-01-31 13:43:17 UTC
Size:
955 bytes
patch
obsolete
>From 46b1df38e1e8f257ac497db65072a71c69019f7f Mon Sep 17 00:00:00 2001 >From: Stanislav Ochotnicky <sochotnicky@redhat.com> >Date: Fri, 31 Jan 2014 14:39:52 +0100 >Subject: [PATCH] Try git am before trying git apply for %autosetup > (RhBug:1059285) > >- This way we preserve commit messages if the patches have been produced by git > and apply as ordinary diff otherwise >--- > macros.in | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > >diff --git a/macros.in b/macros.in >index fd7443c..9edb715 100644 >--- a/macros.in >+++ b/macros.in >@@ -1075,8 +1075,9 @@ done \ > --author "%{__scm_author}" -m "%{name}-%{version} base" > > %__scm_apply_git(qp:m:)\ >-%{__git} apply --index %{-p:-p%{-p*}} -\ >-%{__git} commit %{-q} -m %{-m*} --author "%{__scm_author}" >+%{__git} am %{-p:-p%{-p*}} - || \\\ >+(%{__git} apply --index %{-p:-p%{-p*}} - && \\\ >+%{__git} commit %{-q} -m %{-m*} --author "%{__scm_author}") > > # Quilt > %__scm_setup_quilt(q) %{nil} >-- >1.8.3.2 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=857859">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 1059285
: 857859