From: Avery Pennarun <apenwarr@gmail.com>
Date: Sat, 25 Apr 2009 02:05:30 +0000 (-0400)
Subject: Even more aggressive commit trimming.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d691265880abea4428783beb858683be56f3b340;p=git.git

Even more aggressive commit trimming.

Now we cut out a commit if any of its parents had the same tree; just use
that parent in its place.  This makes the history look nice, but I don't
think it's quite right...
---

diff --git a/git-subtree.sh b/git-subtree.sh
index e6d8ce881..03107e225 100755
--- a/git-subtree.sh
+++ b/git-subtree.sh
@@ -202,6 +202,29 @@ tree_changed()
 	fi
 }
 
+copy_or_skip()
+{
+	rev="$1"
+	tree="$2"
+	newparents="$3"
+	assert [ -n "$tree" ]
+
+	p=""
+	for parent in $newparents; do
+		ptree=$(toptree_for_commit $parent) || exit $?
+		if [ "$ptree" = "$tree" ]; then
+			# any identical parent means this commit is unnecessary
+			echo $parent
+			return 0
+		elif [ -n "$ptree" ]; then
+			# an existing, non-identical parent is important
+			p="$p -p $parent"
+		fi
+	done
+	
+	copy_commit $rev $tree "$p" || exit $?
+}
+
 cmd_split()
 {
 	debug "Splitting $dir..."
@@ -238,16 +261,7 @@ cmd_split()
 		debug "  tree is: $tree"
 		[ -z $tree ] && continue
 
-		p=""
-		for parent in $newparents; do
-			p="$p -p $parent"
-		done
-			
-		if tree_changed $tree $newparents; then
-			newrev=$(copy_commit $rev $tree "$p") || exit $?
-		else
-			newrev="$newparents"
-		fi
+		newrev=$(copy_or_skip "$rev" "$tree" "$newparents") || exit $?
 		debug "  newrev is: $newrev"
 		cache_set $rev $newrev
 		cache_set latest_new $newrev
diff --git a/test.sh b/test.sh
index 8a9d92f70..a8ed0dbc7 100755
--- a/test.sh
+++ b/test.sh
@@ -93,4 +93,4 @@ git branch subproj-merge-split3
 cd ../mainline
 git fetch ../subproj subproj-merge-split3
 git branch subproj-merge-split3 FETCH_HEAD
-git merge subproj-merge-split3
+git merge -s subtree subproj-merge-split3