path: root/
AgeCommit message (Collapse)Author
2005-12-17Fix git-am --skipJan Harkes
git-am --skip does not unpack the next patch and ends up reapplying the old patch, believing that it is the new patch in the sequence. If the old patch applied successfully it will commit it with the supposedly skipped log message and ends up dropping the following patch. If the patch did not apply the user is left with the conflict he tried to skip and has to unpack the next patch in the sequence by hand to get git-am back on track. By clearing the resume variable whenever skips bumps the sequence counter we correctly unpack the next patch. I also added another resume= in the case a patch file is missing from the sequence to avoid the same problem when a file in the sequence was removed. Signed-off-by: Jan Harkes <> Signed-off-by: Junio C Hamano <>
2005-12-15mailinfo and git-am: allow "John Doe <johndoe>"Junio C Hamano
An isolated developer could have a local-only e-mail, which will be stripped out by mailinfo because it lacks '@'. Define a fallback parser to accomodate that. At the same time, reject authorless patch in git-am. Signed-off-by: Junio C Hamano <>
2005-12-14Merge branch 'hold/am'Junio C Hamano
2005-12-14git-am: Usage string
Signed-off-by: Fredrik Kuivinen <> Signed-off-by: Junio C Hamano <>
2005-12-14git-am support for naked email messages (take 2)H. Peter Anvin
This allows git-am to accept single-message files as well as mboxes. Unlike the previous version, this one doesn't need to be explicitly told which one it is; rather, it looks to see if the first line is a From line and uses it to select mbox mode or not. I moved the logic to do all this into git-mailsplit, which got a new user interface as result, although the old interface is still available for backwards compatibility. [jc: applied with two obvious fixes.] Signed-off-by: H. Peter Anvin <> Signed-off-by: Junio C Hamano <>
2005-12-07Use printf rather than echo -n.Jason Riedy
On AIX, there is no -n option to the system's echo. Instead, it needs the '\c' control character. We could replace echo -n "foo" with echo -e "foo\c" but printf is recommended by most man pages. Tested on AIX 5.3, Solaris 8, and Debian. [jc: futureproofed two instances that uses variable with '%s' so later feeding different messages would not break things too easily; others are emitting literal so whoever changes the literal ought to notice more easily so they are safe.] Signed-off-by: E. Jason Riedy <> Signed-off-by: Junio C Hamano <>
2005-11-25git-sh-setup: die if outside git repository.Junio C Hamano
Now all the users of this script detect its exit status and die, complaining that it is outside git repository. So move the code that dies from all callers to git-sh-setup script. Signed-off-by: Junio C Hamano <>
2005-11-18git-am: --binary; document --resume and --binary.Junio C Hamano
Now git-apply can grok binary replacement patches, give --binary flag to git-am. As a safety measure, this is not by default enabled, so that you do not let malicious e-mailed patch to replace an arbitrary path with just a couple of lines (diff index lines, the filename and string "Binary files "...) by accident. Signed-off-by: Junio C Hamano <>
2005-11-17git-am: --resolved.Junio C Hamano
After failed patch application, you can manually apply the patch (this includes resolving the conflicted merge after git-am falls back to 3-way merge) and run git-update-index on necessary paths to prepare the index file in a shape a successful patch application should have produced. Then re-running git-am --resolved would record the resulting index file along with the commit log information taken from the patch e-mail. Signed-off-by: Junio C Hamano <>
2005-11-08git-am: do not lose already edited final-commit when resuming.Junio C Hamano
The last round stopped munging the patch when resuming, but failed to preserve final-commit. Signed-off-by: Junio C Hamano <>
2005-10-26Add [v]iew patch in git-am interactive.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-10-26git-am: make it easier after fixing up an unapplicable patch.Junio C Hamano
Instead of having the user to edit the mail message, let the hand merge result stored in .dotest/patch and continue, which is easier to manage. Signed-off-by: Junio C Hamano <>
2005-10-21Fix missing exports in git-amJunio C Hamano
Signed-off-by: Junio C Hamano <>
2005-10-18Update git-apply to use C-style quoting for funny pathnames.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-10-13git-am: do not fail if 3-way fallback succeeds.Junio C Hamano
The current one incorrectly stops there without committing. Signed-off-by: Junio C Hamano <>
2005-10-13git-am: interactive should fail gracefully.Junio C Hamano
When feeding patches from standard input, and --interactive is specified, quit, so that the user can re-run the command, instead of infinitely looping. Signed-off-by: Junio C Hamano <>
2005-10-07Add git-am, applymbox replacement.Junio C Hamano
It reorganizes the code and also has saner command line options syntax. Unlike git-applymbox, it can take more than one mailbox file from the command line, as well as reading from the standard input when '-' is specified. Signed-off-by: Junio C Hamano <>