Merge branch 'jk/git-connection-deadlock-fix'

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index b18fc85c4c1eecde36a7e953e1997bab1b97628b..daf19451ba7df541d1314c880679749232ccce35 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -651,7 +651,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
        if (import_filename)
                import_marks(import_filename);
 
-       if (import_filename && revs.prune_data)
+       if (import_filename && revs.prune_data.nr)
                full_tree = 1;
 
        get_tags_and_duplicates(&revs.pending, &extra_refs);