All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: Robin Rosenberg <robin.rosenberg.lists@dewire.com>
Cc: "Mike Ralphson" <mike.ralphson@gmail.com>,
	"Shawn O. Pearce" <spearce@spearce.org>,
	"Marek Zawirski" <marek.zawirski@gmail.com>,
	git@vger.kernel.org
Subject: Differences between git-applu and GNU patch (was: [JGIT PATCH 1/1] jgit: create a tag command)
Date: Fri, 11 Jul 2008 03:50:30 -0700 (PDT)	[thread overview]
Message-ID: <m38ww8elu8.fsf_-_@localhost.localdomain> (raw)
In-Reply-To: <200807102002.11044.robin.rosenberg.lists@dewire.com>

Robin Rosenberg <robin.rosenberg.lists@dewire.com> writes:

> torsdagen den 10 juli 2008 17.31.06 skrev Mike Ralphson:

> > 
> > Apologies this will be whitespace damaged, but it's trivial.
>
> Don't do like that again : Had to use patch -l to apply this.
> Why doesn't git am have that?

It is not git-am that should have implemented -l / --ignore-whitespace
option, but git-apply... well, beside passing it to git-apply of course.


I tried to look up how git-apply is implemented (builtin-apply.c),
but it looks like it implements patching itself, and I am not familiar
at all with this code... BTW. why applying patch is not left to xdiff
code?

It would be nice if git-apply implemented larger subset of GNU patch
options, for example --dry-run (which is similar but I think not
exactly the same as --check), --fuzz=<num> (how it differs from -C<n>?)
--strip=<num> as equivalent to -p<n>, -l / --ignore-whitespace, 
--reject-file=<rejectfile> together with --reject...
-- 
Jakub Narebski
Poland
ShadeHawk on #git

  reply	other threads:[~2008-07-11 10:51 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-06 22:41 [JGIT PATCH 1/1] jgit: create a tag command Robin Rosenberg
2008-07-06 23:16 ` Robin Rosenberg
2008-07-10 15:31   ` Mike Ralphson
2008-07-10 18:02     ` Robin Rosenberg
2008-07-11 10:50       ` Jakub Narebski [this message]
2008-07-11  2:05     ` Shawn O. Pearce
2008-07-11  8:28       ` Robin Rosenberg
2008-07-11  8:45       ` Mike Ralphson
2008-07-12  3:01         ` Shawn O. Pearce
2008-07-12  3:42           ` Shawn O. Pearce
2008-07-17 21:31             ` Robin Rosenberg
2008-07-17 21:45               ` Shawn O. Pearce
2008-07-17 22:24                 ` Robin Rosenberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=m38ww8elu8.fsf_-_@localhost.localdomain \
    --to=jnareb@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=marek.zawirski@gmail.com \
    --cc=mike.ralphson@gmail.com \
    --cc=robin.rosenberg.lists@dewire.com \
    --cc=spearce@spearce.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.