diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/fast-export.c | 7 | ||||
| -rw-r--r-- | builtin/gc.c | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 37c01d6c6f..fcf6b00d5f 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -39,7 +39,7 @@ enum sign_mode { SIGN_ABORT, SIGN_VERBATIM, SIGN_STRIP, SIGN_WARN_VERBATIM, SIGN static int progress; static enum sign_mode signed_tag_mode = SIGN_ABORT; -static enum sign_mode signed_commit_mode = SIGN_ABORT; +static enum sign_mode signed_commit_mode = SIGN_STRIP; static enum tag_of_filtered_mode { TAG_FILTERING_ABORT, DROP, REWRITE } tag_of_filtered_mode = TAG_FILTERING_ABORT; static enum reencode_mode { REENCODE_ABORT, REENCODE_YES, REENCODE_NO } reencode_mode = REENCODE_ABORT; static int fake_missing_tagger; @@ -1269,7 +1269,6 @@ int cmd_fast_export(int argc, const char *prefix, struct repository *repo UNUSED) { - const char *env_signed_commits_noabort; struct rev_info revs; struct commit *commit; char *export_filename = NULL, @@ -1327,10 +1326,6 @@ int cmd_fast_export(int argc, if (argc == 1) usage_with_options (fast_export_usage, options); - env_signed_commits_noabort = getenv("FAST_EXPORT_SIGNED_COMMITS_NOABORT"); - if (env_signed_commits_noabort && *env_signed_commits_noabort) - signed_commit_mode = SIGN_WARN_STRIP; - /* we handle encodings */ git_config(git_default_config, NULL); diff --git a/builtin/gc.c b/builtin/gc.c index e33ba946e4..7dc94f243d 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -516,7 +516,7 @@ static uint64_t total_ram(void) total *= (uint64_t)si.mem_unit; return total; } -#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) || defined(HW_PHYSMEM)) +#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) || defined(HW_PHYSMEM) || defined(HW_PHYSMEM64)) int64_t physical_memory; int mib[2]; size_t length; @@ -524,6 +524,8 @@ static uint64_t total_ram(void) mib[0] = CTL_HW; # if defined(HW_MEMSIZE) mib[1] = HW_MEMSIZE; +# elif defined(HW_PHYSMEM64) + mib[1] = HW_PHYSMEM64; # else mib[1] = HW_PHYSMEM; # endif |