aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Kellermann <Benjamin.Kellermann@gmx.de>2016-10-14 23:22:38 +0200
committerBenjamin Kellermann <Benjamin.Kellermann@gmx.de>2016-10-14 23:22:38 +0200
commitbc6c70db485ff169d9b150a9d9aeeb0adf2559ac (patch)
treed739f6bdc960378f646992f00c4cbee8932f0d7d
parent6857ba9ce6c413d9cf524c10c09af13ae907232e (diff)
forget history in examples
-rwxr-xr-xexample.cgi2
-rw-r--r--vcs_git.rb5
2 files changed, 6 insertions, 1 deletions
diff --git a/example.cgi b/example.cgi
index 2137514..e631057 100755
--- a/example.cgi
+++ b/example.cgi
@@ -47,7 +47,7 @@ if $cgi.include?("poll")
if poll[:revno]
Dir.chdir(targeturl)
- VCS.revert(poll[:revno])
+ VCS.reset(poll[:revno])
Dir.chdir("..")
end
diff --git a/vcs_git.rb b/vcs_git.rb
index 6b3225f..48a6e29 100644
--- a/vcs_git.rb
+++ b/vcs_git.rb
@@ -79,6 +79,11 @@ class VCS
runcmd(GITCMD, "checkout", revhash, ".")
VCS.commit("Reverted Poll to version #{revno}")
end
+
+ def VCS.reset revno
+ revhash = runcmd(GITCMD, "log", "--format=%H").split("\n").reverse[revno-1]
+ runcmd(GITCMD, "checkout", "-B", "master", revhash)
+ end
end