Comment #3 on issue 3702 by alexande...@gmail.com: rbt patch fails with git version<1.7.12
https://code.google.com/p/reviewboard/issues/detail?id=3702

I have the same problem.
==========================================
$ git --version
git version 1.7.1

==========================================
$ git status
# On branch master
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       .reviewboardrc
nothing added to commit but untracked files present (use "git add" to track)

==========================================

 $ rbt -v
RBTools 0.7.4

==========================================

$ rbt patch 1022
Patch is being applied from request 1022 with diff revision 2.

error: unknown switch `3'
usage: git apply [options] [<patch>...]

    --exclude <path>      don't apply changes matching the given path
    --include <path>      apply changes matching the given path
-p <num> remove <num> leading slashes from traditional diff paths
    --no-add              ignore additions made by the patch
--stat instead of applying the patch, output diffstat for the input --numstat shows number of added and deleted lines in decimal notation --summary instead of applying the patch, output a summary for the input --check instead of applying the patch, see if the patch is applicable --index make sure the patch is applicable to the current index
    --cached              apply a patch without touching the working tree
--apply also apply the patch (use with --stat/--summary/--check)
    --build-fake-ancestor <FILE>
build a temporary index based on embedded index information
    -z                    paths are separated with NUL character
    -C <n>                ensure at least <n> lines of context match
    --whitespace <action>
detect new or modified lines that have whitespace errors
    --ignore-space-change
                          ignore changes in whitespace when finding context
    --ignore-whitespace   ignore changes in whitespace when finding context
    -R, --reverse         apply the patch in reverse
    --unidiff-zero        don't expect at least one line of context
--reject leave the rejected hunks in corresponding *.rej files
    -v, --verbose         be verbose
--inaccurate-eof tolerate incorrectly detected missing new-line at the end of file
    --recount             do not trust the line counts in the hunk headers
    --directory <root>    prepend <root> to all filenames

ERROR: Unable to apply the patch. The patch may be invalid, or there may be conflicts that could not be resolved.



--
You received this message because this project is configured to send all issue notifications to this address.
You may adjust your notification preferences at:
https://code.google.com/hosting/settings

--
You received this message because you are subscribed to the Google Groups 
"reviewboard-issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to reviewboard-issues+unsubscr...@googlegroups.com.
To post to this group, send email to reviewboard-issues@googlegroups.com.
Visit this group at http://groups.google.com/group/reviewboard-issues.
For more options, visit https://groups.google.com/d/optout.

Reply via email to