From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 25 Jul 2009 07:45:03 +0000 (-0700)
Subject: Merge branch 'js/maint-graft-unhide-true-parents'
X-Git-Tag: v1.6.4-rc3~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=130b04ab37d74e574d525df7948b963b13c6bdbf;p=git.git

Merge branch 'js/maint-graft-unhide-true-parents'

* js/maint-graft-unhide-true-parents:
  git repack: keep commits hidden by a graft
  Add a test showing that 'git repack' throws away grafted-away parents

Conflicts:
	git-repack.sh
---

130b04ab37d74e574d525df7948b963b13c6bdbf
diff --cc git-repack.sh
index 1bf239499,be0c8435d..1eb3bca35
--- a/git-repack.sh
+++ b/git-repack.sh
@@@ -80,11 -80,13 +80,11 @@@ case ",$all_into_one," i
  	;;
  esac
  
 -args="$args $local $quiet $no_reuse$extra"
 +args="$args $local ${GIT_QUIET:+-q} $no_reuse$extra"
- names=$(git pack-objects --honor-pack-keep --non-empty --all --reflog $args </dev/null "$PACKTMP") ||
+ names=$(git pack-objects --keep-true-parents --honor-pack-keep --non-empty --all --reflog $args </dev/null "$PACKTMP") ||
  	exit 1
  if [ -z "$names" ]; then
 -	if test -z "$quiet"; then
 -		echo Nothing new to pack.
 -	fi
 +	say Nothing new to pack.
  fi
  
  # Ok we have prepared all new packfiles.