diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:15 -0700 |
| commit | af655431f53c20e3d0ed236544397c69974267f4 (patch) | |
| tree | ddfc95bd3f768e98709cc2d7a445e64117d4c784 /fast-import.c | |
| parent | 78f17935a306dfd7a1f32c923e0b05a094bf0c25 (diff) | |
| parent | 63a2f6139c33b7231baad8e3bfcc218ef6b63418 (diff) | |
| download | git-af655431f53c20e3d0ed236544397c69974267f4.tar.gz git-af655431f53c20e3d0ed236544397c69974267f4.tar.xz | |
Merge branch 'sr/remote-helper-export'
* sr/remote-helper-export:
t5800: testgit helper requires Python support
Makefile: Simplify handling of python scripts
remote-helpers: add tests for testgit helper
remote-helpers: add testgit helper
remote-helpers: add support for an export command
remote-helpers: allow requesing the path to the .git directory
fast-import: always create marks_file directories
clone: also configure url for bare clones
clone: pass the remote name to remote_get
Conflicts:
Makefile
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fast-import.c b/fast-import.c index 309f2c58a..129a78683 100644 --- a/fast-import.c +++ b/fast-import.c @@ -2707,6 +2707,7 @@ static void option_import_marks(const char *marks, int from_stream) } import_marks_file = make_fast_import_path(marks); + safe_create_leading_directories_const(import_marks_file); import_marks_file_from_stream = from_stream; } @@ -2737,6 +2738,7 @@ static void option_active_branches(const char *branches) static void option_export_marks(const char *marks) { export_marks_file = make_fast_import_path(marks); + safe_create_leading_directories_const(export_marks_file); } static void option_export_pack_edges(const char *edges) |