Mercurial > gub

changeset 2974:e1b1550e31f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove superfluous --git-dir ; run fetch with --no-tags.
author hanwen <hanwen@lilypond.org>
date Thu, 14 Dec 2006 15:44:19 +0100
parents d72314d6cea4
children 84351e58c297
files lib/repository.py
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lib/repository.py	Wed Dec 13 15:30:48 2006 +0100
+++ b/lib/repository.py	Thu Dec 14 15:44:19 2006 +0100
@@ -313,7 +313,7 @@
             return
 
         if revision:
-            contents = self.git_pipe ('--git-dir %(repo)s ls-tree %(revision)s' % locals (),
+            contents = self.git_pipe ('ls-tree %(revision)s' % locals (),
                                       ignore_errors=True)
 
             if contents:
@@ -322,8 +322,9 @@
             self.git ('--git-dir %(repo)s http-fetch -v -c %(revision)s' % locals ())
 
         refs = '%s:%s' % (self.remote_branch, self.branch)
-        
-        self.git ('--git-dir %(repo)s fetch --update-head-ok %(source)s %(refs)s ' % locals ())
+
+        ## ugh : --no-tags is a 1.4.4.2 oddity.
+        self.git ('fetch --no-tags --update-head-ok %(source)s %(refs)s ' % locals ())
         self.checksums = {}
 
     def get_checksum (self):
@@ -336,7 +337,7 @@
 
         repo_dir = self.repo_dir
         if os.path.isdir (repo_dir):
-            cs = self.git_pipe ('--git-dir %(repo_dir)s describe --abbrev=24 %(branch)s' % locals ())
+            cs = self.git_pipe ('describe --abbrev=24 %(branch)s' % locals ())
             cs = cs.strip ()
             self.checksums[branch] = cs
             return cs