[PATCH 3/3] cg-admin-rewritehist: seed the map with the parent of the -r arg, not with itself
From: Yann Dirson <hidden>
Date: 2016-06-15 22:42:29
Subsystem:
the rest · Maintainer:
Linus Torvalds
This is a fix for 95621e54cedef1c4a270af5570a72fc1331b5fcb. Signed-off-by: Yann Dirson <redacted> --- cg-admin-rewritehist | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cg-admin-rewritehist b/cg-admin-rewritehist
index 7cbdb30..6dd8b92 100755
--- a/cg-admin-rewritehist
+++ b/cg-admin-rewritehist@@ -157,7 +157,7 @@ while optparse; do git-rev-parse "$OPTARG" >/dev/null || die "Unknown revision '$OPTARG'" git-rev-parse "$OPTARG^" >/dev/null || die "Revision '$OPTARG' does not have parents, check what you really want" startrev="^$OPTARG^ $OPTARG $startrev" - startrevparents="$OPTARG $startrevparents" + startrevparents="$OPTARG^ $startrevparents" elif optparse --env-filter=; then filter_env="$OPTARG" elif optparse --tree-filter=; then