git/git-am.sh, branch v1.6.4

Merge branch 'gb/am-foreign'

2009-07-06T16:38:33Z

* gb/am-foreign: git-am: refactor 'cleaning up and aborting' git-am foreign patch support: StGIT support git-am foreign patch support: autodetect some patch formats git-am foreign patch support: introduce patch_format

am, rebase: teach quiet option

2009-06-18T18:54:48Z

git-am and git-rebase are talkative scripts. Teach them to be quiet when told, allowing them to speak only when they fail or experience errors. The quiet option is maintained when git-am or git-rebase fails to apply a patch. This means subsequent --resolved, --continue, --skip, --abort invocations will be quiet if the original invocation was quiet. Drop a handful of >&2 redirection; the rest of the program sends all the info messages to stdout, not to stderr. Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

am: suppress apply errors when using 3-way

2009-06-18T16:50:25Z

git-am with 3-way outputs errors when applying, even though the 3-way will usually be successful. We suppress these errors from git-apply because they are not "true" errors until the 3-way has been attempted. Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

git-am: refactor 'cleaning up and aborting'

2009-06-14T00:30:38Z

Introduce a clean_abort function that echoes an optional error message to standard error, removes the dotest directory and exits with status 1. Use it when patch format detection or patch splitting fails early. Signed-off-by: Giuseppe Bilotta Signed-off-by: Junio C Hamano

git-am foreign patch support: StGIT support

2009-05-29T06:07:43Z

Support StGIT patches by implementing a simple perl-based converter mimicking StGIT's own parse_patch. Also support StGIT patch series by 'exploding' the index into a list of files and re-running the mail splitting with patch_format set to stgit. Signed-off-by: Giuseppe Bilotta Signed-off-by: Junio C Hamano

git-am foreign patch support: autodetect some patch formats

2009-05-29T06:06:34Z

Default to mbox format if input is from stdin. Otherwise, look at the first few lines of the first patch to try to guess its format. Include checks for mailboxes, stgit patch series, stgit single patches and hg patches. Signed-off-by: Junio C Hamano

git-am foreign patch support: introduce patch_format

2009-05-29T06:04:50Z

Set up a framework to allow git-am to support patches which are not in mailbox format. Introduce a patch_format variable that presently can only be set from the command line, defaulting to 'mbox' (the only supported format) if not specified. Signed-off-by: Junio C Hamano

am: simplify "sq" function by using "git rev-parse --sq-quote"

2009-05-10T07:30:29Z

Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

Work around ash "alternate value" expansion bug

2009-04-19T04:37:46Z

Ash (used as /bin/sh on many distros) has a shell expansion bug for the form ${var:+word word}. The result is a single argument "word word". Work around by using ${var:+word} ${var:+word} or equivalent. Signed-off-by: Ben Jackson Signed-off-by: Junio C Hamano

git-am: teach git-am to apply a patch to an unborn branch

2009-04-13T01:42:15Z

People sometimes wonder why they cannot apply a patch that only creates new files to an unborn branch. Signed-off-by: Nanako Shiraishi Signed-off-by: Junio C Hamano