From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Jul 2023 16:45:22 +0000 (-0700)
Subject: Merge branch 'rs/pack-objects-parseopt-fix'
X-Git-Tag: v2.42.0-rc0~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ddcb8fd8b94c066406c2a4f41e04122cb2a742ad;p=thirdparty%2Fgit.git

Merge branch 'rs/pack-objects-parseopt-fix'

Command line parser fix.

* rs/pack-objects-parseopt-fix:
  pack-objects: fix --no-quiet
  pack-objects: fix --no-keep-true-parents
---

ddcb8fd8b94c066406c2a4f41e04122cb2a742ad
diff --cc environment.h
index 611aa0ffed,96bc95bbeb..c5377473c6
--- a/environment.h
+++ b/environment.h
@@@ -193,9 -194,10 +193,9 @@@ extern enum object_creation_mode object
  
  extern char *notes_ref_name;
  
- extern int grafts_replace_parents;
+ extern int grafts_keep_true_parents;
  
  extern int repository_format_precious_objects;
 -extern int repository_format_worktree_config;
  
  /*
   * Create a temporary file rooted in the object database directory, or