diff options
| author | Gustav Hållberg <gustav@virtutech.com> | 2009-10-28 12:21:28 +0100 |
|---|---|---|
| committer | Karl Wiberg <kha@treskal.com> | 2009-10-28 12:22:12 +0100 |
| commit | 09700575b6884f6ed304b19c9b56c1bcb13ec31f (patch) | |
| tree | 6f29c12ebe262269b79e4d0fab94006140a1132a | |
| parent | e1e5f6d7a12e229db51445f6f8aca3ba81595ed7 (diff) | |
| download | stgit-09700575b6884f6ed304b19c9b56c1bcb13ec31f.tar.gz | |
fold/import: Remove requirement on git 1.6.2
Send "-p<N>" flag to "git apply" rather than "-p <N>".
This removes dependency on git 1.6.2, commit:
f26c494 parse-opt: migrate builtin-apply.
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Signed-off-by: Karl Wiberg <kha@treskal.com>
| -rw-r--r-- | stgit/git.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/stgit/git.py b/stgit/git.py index 97b1e96..0316342 100644 --- a/stgit/git.py +++ b/stgit/git.py @@ -841,7 +841,7 @@ def apply_patch(filename = None, diff = None, base = None, if reject: cmd += ['--reject'] if strip != None: - cmd += ['-p', str(strip)] + cmd += ['-p%s' % (strip,)] try: GRun(*cmd).raw_input(diff).no_output() except GitRunException: |