[jhbuild] [git] pass clean environment got git --version



commit d71bce0a715b596e598502a83e6bd54959707f87
Author: Frédéric Péters <fpeters 0d be>
Date:   Fri Jun 5 19:12:21 2009 +0200

    [git] pass clean environment got git --version
---
 jhbuild/versioncontrol/git.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/jhbuild/versioncontrol/git.py b/jhbuild/versioncontrol/git.py
index d03c8bc..b2db93a 100644
--- a/jhbuild/versioncontrol/git.py
+++ b/jhbuild/versioncontrol/git.py
@@ -288,7 +288,8 @@ class GitBranch(Branch):
         if stashed:
             # git stash pop was introduced in 1.5.5, 
             if check_version(['git', '--version'],
-                         r'git version ([\d.]+)', '1.5.5'):
+                         r'git version ([\d.]+)', '1.5.5',
+                         extra_env=get_git_extra_env()):
                 buildscript.execute(['git', 'stash', 'pop'], **git_extra_args)
             else:
                 buildscript.execute(['git', 'stash', 'apply', 'jhbuild-stash'],



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]