[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/emerge/bin/Source
From:       Andre Heinecke <aheinecke () intevation ! de>
Date:       2010-11-20 17:41:40
Message-ID: 20101120174140.0FC1FAC8A3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1199120 by aheinecke:

Let git pull do the merging but tell it wich branch to pull.
Tested in several scenarios everything we do appears to work.


 M  +3 -3      GitSource.py  


--- trunk/kdesupport/emerge/bin/Source/GitSource.py #1199119:1199120
@@ -81,7 +81,9 @@
             os.environ[ "PATH" ] = os.path.join( self.rootdir, "git", "bin" ) + ";" \
+ safePath  
             if os.path.exists( self.checkoutDir() ):
-                ret = self.shell.execute( self.checkoutDir(), "git", "fetch" )
+                if not repoTag:
+                    ret = self.shell.execute( self.checkoutDir(), "git",
+                            "pull origin %s" % repoBranch or "master" )
             else:
                 # it doesn't exist so clone the repo
                 os.makedirs( self.checkoutDir() )
@@ -105,8 +107,6 @@
                 else:
                     ret = self.shell.execute( self.checkoutDir(), "git", "checkout \
%s" % repoTag )  
-            if ret and not repoTag:
-                ret = self.shell.execute( self.checkoutDir(), "git", "merge origin \
%s" % self.__getCurrentBranch() )  else:
             utils.debug( "skipping git fetch (--offline)" )
         return ret


[prev in list] [next in list] [prev in thread] [next in thread]