[meld] Fix a couple of incorrect direct invocations of git
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Fix a couple of incorrect direct invocations of git
- Date: Fri, 11 Jan 2013 21:36:54 +0000 (UTC)
commit 3493d98313d66dcec7f9b19074f3ab67305f7c71
Author: Kai Willadsen <kai willadsen gmail com>
Date: Fri Jan 11 06:14:13 2013 +1000
Fix a couple of incorrect direct invocations of git
meld/vc/git.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meld/vc/git.py b/meld/vc/git.py
index 5684256..aa23b20 100644
--- a/meld/vc/git.py
+++ b/meld/vc/git.py
@@ -91,7 +91,7 @@ class Vc(_vc.CachedVc):
path = path[len(self.root) + 1:]
obj = commit + ":" + path
- process = subprocess.Popen(["git", "cat-file", "blob", obj],
+ process = subprocess.Popen([self.CMD, "cat-file", "blob", obj],
cwd=self.location, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
vc_file = process.stdout
@@ -122,7 +122,7 @@ class Vc(_vc.CachedVc):
try:
# Update the index before getting status, otherwise we could
# be reading stale status information
- _vc.popen(["git", "update-index", "--refresh"],
+ _vc.popen([self.CMD, "update-index", "--refresh"],
cwd=self.location)
# Get the status of files that are different in the "index" vs
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]