Mercurial > gub

changeset 3501:d3db27369b22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Git reset --hard before patching.
author Han-Wen Nienhuys <hanwen@lilypond.org>
date Thu, 24 May 2007 23:13:55 -0300
parents 72f2bb8d2117
children aeacf06a99b5
files gub/specs/git.py
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/git.py	Sat May 19 10:40:59 2007 -0300
+++ b/gub/specs/git.py	Thu May 24 23:13:55 2007 -0300
@@ -8,6 +8,7 @@
         self.with_template (mirror='http://kernel.org/pub/software/scm/git/git-%(version)s.tar.bz2',
                    version='1.5.1.4')
     def patch (self):
+        self.system('cd %(srcdir)s && git reset --hard HEAD')
         self.shadow_tree ('%(srcdir)s', '%(builddir)s')
         self.file_sub ([('git describe','true')],
                        '%(srcdir)s/GIT-VERSION-GEN')
@@ -53,11 +54,13 @@
                 ]
 
     def patch (self):
+        self.system('cd %(srcdir)s && git reset --hard HEAD')
         targetpackage.TargetBuildSpec.patch (self)
         self.system ('rm -rf %(builddir)s')
         self.shadow_tree ('%(srcdir)s', '%(builddir)s')
         self.file_sub ([('git describe','true')],
                         '%(srcdir)s/GIT-VERSION-GEN')
+        self.system('cd %(srcdir)s && patch -p1 < %(patchdir)s/git-1.5-shell-anality.patch')
 
 
 class Git__mingw (Git):
@@ -72,7 +75,6 @@
                        '%(builddir)s/config.mak.autogen')
         self.file_sub ([('-lsocket',
                          '-lwsock32'),
-                        ('TRACK_CFLAGS *=', 'XXX_TRACK_CFLAGS = '),
                         ],
                        '%(builddir)s/Makefile')