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

diff --cc builtin/pack-objects.c
Simple merge

diff --cc commit.c
Simple merge

diff --cc environment.c
Simple merge

diff --cc environment.h
index 611aa0ffedeea34a23b0401c8b6656b1de379f50,96bc95bbebc17d6f710e5fa470b1cde6d7f720d4..c5377473c683390992315f69a63c557b25c655bb
--- 1/environment.h
--- 2/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