From bc6c70db485ff169d9b150a9d9aeeb0adf2559ac Mon Sep 17 00:00:00 2001 From: Benjamin Kellermann Date: Fri, 14 Oct 2016 23:22:38 +0200 Subject: forget history in examples --- example.cgi | 2 +- vcs_git.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3