[jhbuild] Let sticky date move back and forth along master

[Frederic Peters <fpeters src gnome org>]

commit db135c55b161c74603682be42d061143812631eb
Author: Dirk Wallenstein <halsmit t-online de>
Date:   Fri Jul 9 10:31:00 2010 +0200

    Let sticky date move back and forth along master
    
    Facilitate the bisection of a module, by making it possible to generate
    a list of dependencies and move them back and forth in time after each
    bisection step.
    Previously it was only possible to move backwards in time.
    
    Rename rewind_to_sticky_date to move_to_sticky_date to reflect this
    change. There are no external users for this member.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=623930

 jhbuild/versioncontrol/git.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/jhbuild/versioncontrol/git.py b/jhbuild/versioncontrol/git.py
index 94df87a..775a242 100644
--- a/jhbuild/versioncontrol/git.py
+++ b/jhbuild/versioncontrol/git.py
@@ -288,7 +288,7 @@ class GitBranch(Branch):
                 buildscript.execute(['git', 'stash', 'apply', 'jhbuild-stash'],
                         **git_extra_args)
 
-    def rewind_to_sticky_date(self, buildscript):
+    def move_to_sticky_date(self, buildscript):
         if self.config.quiet_mode:
             quiet = ['-q']
         else:
@@ -322,8 +322,8 @@ class GitBranch(Branch):
         return True
 
     def _get_commit_from_date(self):
-        cmd = ['git', 'log', '--max-count=1',
-               '--until=%s' % self.config.sticky_date]
+        cmd = ['git', 'log', '--max-count=1', '--first-parent',
+                '--until=%s' % self.config.sticky_date, 'master']
         cmd_desc = ' '.join(cmd)
         proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                                 cwd=self.get_checkoutdir(),
@@ -408,7 +408,7 @@ class GitBranch(Branch):
         self.pull_current_branch(buildscript)
 
         if self.config.sticky_date:
-            self.rewind_to_sticky_date(buildscript)
+            self.move_to_sticky_date(buildscript)
 
         self._update_submodules(buildscript)