[pacman-dev] [PATCH 3/5] bacman: small code cleanup

Dan McGee dpmcgee at gmail.com
Thu Oct 6 02:00:32 EDT 2011

On Mon, Oct 3, 2011 at 5:22 PM, lolilolicon <lolilolicon at gmail.com> wrote:
> This includes:
>  - Quoting fixes.
>  - Drop deprecated mktemp option -p.
>  - Set extglob nullglob shell options at the top.
>  - Use extended globbing instead of regex to match %HEADER% in pacman db.
> Signed-off-by: lolilolicon <lolilolicon at gmail.com>
> ---
>  contrib/bacman.in |   21 +++++++++++----------
>  1 files changed, 11 insertions(+), 10 deletions(-)

$ git am -3 -s < /tmp/bacman-code-cleanup.patch
Applying: bacman: small code cleanup
fatal: sha1 information is lacking or useless (contrib/bacman.in).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 bacman: small code cleanup
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

I don't know what was done here, but I can't apply this as-is.


More information about the pacman-dev mailing list