This patch adds into contrib/ an example script to convert
grafts from an existing grafts file into replace refs using
the new --graft option of "git replace".

While at it let's mention this new script in the
"git replace" documentation for the --graft option.

Signed-off-by: Christian Couder <>
Signed-off-by: Junio C Hamano <>
 Documentation/git-replace.txt             |  4 +++-
 contrib/ | 28 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100755 contrib/

diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt
index 491875e..e1be2e6 100644
--- a/Documentation/git-replace.txt
+++ b/Documentation/git-replace.txt
@@ -79,7 +79,9 @@ OPTIONS
        content as <commit> except that its parents will be
        [<parent>...] instead of <commit>'s parents. A replacement ref
        is then created to replace <commit> with the newly created
-       commit.
+       commit. See contrib/ for an
+       example script based on this option that can convert grafts to
+       replace refs.
 -l <pattern>::
 --list <pattern>::
diff --git a/contrib/ 
new file mode 100755
index 0000000..0cbc917
--- /dev/null
+++ b/contrib/
@@ -0,0 +1,28 @@
+# You should execute this script in the repository where you
+# want to convert grafts to replace refs.
+. $(git --exec-path)/git-sh-setup
+test -f "$GRAFTS_FILE" || die "Could not find graft file: '$GRAFTS_FILE'"
+grep '^[^# ]' "$GRAFTS_FILE" |
+while read definition
+       if test -n "$definition"
+       then
+               echo "Converting: $definition"
+               git replace --graft $definition ||
+                       die "Conversion failed for: $definition"
+       fi
+mv "$GRAFTS_FILE" "$GRAFTS_FILE.bak" ||
+       die "Could not rename '$GRAFTS_FILE' to '$GRAFTS_FILE.bak'"
+echo "Success!"
+echo "All the grafts in '$GRAFTS_FILE' have been converted to replace refs!"
+echo "The grafts file '$GRAFTS_FILE' has been renamed: '$GRAFTS_FILE.bak'"

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to