summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-27 22:14:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-07-27 22:14:18 (GMT)
commit16737445a94cb9b18378fff973129d974c7cdf8a (patch)
tree44fe2074f4d4f146581e33e6d4b15bb9740c0b10 /contrib
parent4799593e26f09e4209249caf9536001036618ac2 (diff)
parent3fa102590758594e3df45c58caba945894a608e5 (diff)
downloadgit-16737445a94cb9b18378fff973129d974c7cdf8a.zip
git-16737445a94cb9b18378fff973129d974c7cdf8a.tar.gz
git-16737445a94cb9b18378fff973129d974c7cdf8a.tar.bz2
Merge branch 'cc/replace-graft'
"git replace" learned a "--graft" option to rewrite parents of a commit. * cc/replace-graft: replace: add test for --graft with a mergetag replace: check mergetags when using --graft replace: add test for --graft with signed commit replace: remove signature when using --graft contrib: add convert-grafts-to-replace-refs.sh Documentation: replace: add --graft option replace: add test for --graft replace: add --graft option replace: cleanup redirection style in tests
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/convert-grafts-to-replace-refs.sh28
1 files changed, 28 insertions, 0 deletions
diff --git a/contrib/convert-grafts-to-replace-refs.sh b/contrib/convert-grafts-to-replace-refs.sh
new file mode 100755
index 0000000..0cbc917
--- /dev/null
+++ b/contrib/convert-grafts-to-replace-refs.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# You should execute this script in the repository where you
+# want to convert grafts to replace refs.
+
+GRAFTS_FILE="${GIT_DIR:-.git}/info/grafts"
+
+. $(git --exec-path)/git-sh-setup
+
+test -f "$GRAFTS_FILE" || die "Could not find graft file: '$GRAFTS_FILE'"
+
+grep '^[^# ]' "$GRAFTS_FILE" |
+while read definition
+do
+ if test -n "$definition"
+ then
+ echo "Converting: $definition"
+ git replace --graft $definition ||
+ die "Conversion failed for: $definition"
+ fi
+done
+
+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'"