[PATCH 2/2] Catch history inconsistency in cg-admin-rewritehist.

From

Yann Dirson <ydirson@altern.org>

Date

May 9, 2006, 22:32 UTC

Message-ID

<20060509223235.20814.475.stgit@gandelf.nowhere.earth>

In-Reply-To

<20060509222738.20814.57282.stgit@gandelf.nowhere.earth>

Dying here prevents to leave the user with a corrupted rewriten history.

Signed-off-by: Yann Dirson <ydirson@altern.org>
---

 cg-admin-rewritehist |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cg-admin-rewritehist b/cg-admin-rewritehist
index 958a8ab..8dd33f2 100755
--- a/cg-admin-rewritehist
+++ b/cg-admin-rewritehist
@@ -218,9 +218,13 @@ while read commit; do
 
 	parentstr=
 	for parent in $(cg-object-id -p $commit); do
-		for reparent in $(cat ../map/$parent); do
-			parentstr="$parentstr -p $reparent"
-		done
+		if [ -r "../map/$parent" ]; then
+			for reparent in $(cat "../map/$parent"); do
+				parentstr="$parentstr -p $reparent"
+			done
+		else
+			die "assertion failed: parent $parent for commit $commit not found in rewritten ones"
+		fi
 	done
 	if [ "$filter_parent" ]; then
 		parentstr="$(echo "$parentstr" | eval "$filter_parent")"