diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-23 18:28:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-23 18:28:37 -0700 |
| commit | d6096f17d2d5d9ccb453aabf8edc6ee238b166fc (patch) | |
| tree | 0699a406f367814d799817402044b89c44491d97 /contrib/fast-import | |
| parent | a7b3269c4b9acde052d75b6dc54c8f869b77eb44 (diff) | |
| parent | 913e0e99b6a6e63af6a062622a1f94bd78fd8052 (diff) | |
| download | git-d6096f17d2d5d9ccb453aabf8edc6ee238b166fc.tar.gz | |
Merge branch 'maint'
* maint:
unpack_trees(): protect the handcrafted in-core index from read_cache()
git-p4: Fix one-liner in p4_write_pipe function.
Completion: add missing '=' for 'diff --diff-filter'
Fix 'git help help'
Diffstat (limited to 'contrib/fast-import')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index f9865b444f..46136d49bf 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -76,7 +76,7 @@ def write_pipe(c, str): def p4_write_pipe(c, str): real_cmd = p4_build_cmd(c) - return write_pipe(c, str) + return write_pipe(real_cmd, str) def read_pipe(c, ignore_error=False): if verbose: |