Skip to content

Instantly share code, notes, and snippets.

@xurizaemon
Created February 24, 2012 04:09
Show Gist options
  • Save xurizaemon/1897443 to your computer and use it in GitHub Desktop.
Save xurizaemon/1897443 to your computer and use it in GitHub Desktop.
Applying patch from http://drupal.org/node/1379334
# fetching a copy of the repo
vayo:tmp chris$ git clone --branch 7.x-1.x [email protected]:project/uc_paymentexpress.git
Cloning into uc_paymentexpress...
remote: Counting objects: 170, done.
remote: Compressing objects: 100% (117/117), done.
remote: Total 170 (delta 111), reused 79 (delta 53)
Receiving objects: 100% (170/170), 71.57 KiB | 27 KiB/s, done.
Resolving deltas: 100% (111/111), done.
vayo:tmp chris$ cd uc_paymentexpress/
# applying via patch (with --dry-run!)
vayo:uc_paymentexpress chris$ curl http://drupal.org/files/uc_paymentexpress-1379334-uc_dps_pxpay_improvements-8b.patch | patch -p1 --dry-run
% Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
100 51128 100 51128 0 0 8217 0 0:00:06 0:00:06 --:--:-- 13469
patching file PxPay_Curl.inc
patching file uc_dps_pxpay.inc
patching file uc_dps_pxpay.info
patching file uc_dps_pxpay.install
patching file uc_dps_pxpay.module
patching file uc_dps_pxpay.pages.inc
patching file uc_dps_pxpay.test
vayo:uc_paymentexpress chris$
# ok, that worked; grab the patch for git apply
vayo:uc_paymentexpress chris$ wget http://drupal.org/files/uc_paymentexpress-1379334-uc_dps_pxpay_improvements-8b.patch
2012-02-24 17:06:12 (12.1 KB/s) - `uc_paymentexpress-1379334-uc_dps_pxpay_improvements-8b.patch' saved [51128/51128]
# let's try git apply now
vayo:uc_paymentexpress chris$ git apply uc_paymentexpress-1379334-uc_dps_pxpay_improvements-8b.patch
uc_paymentexpress-1379334-uc_dps_pxpay_improvements-8b.patch:536: trailing whitespace.
*
warning: 1 line adds whitespace errors.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment