summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu Gautier <mgautier@fedoraproject.org>2009-04-30 23:19:08 +0200
committerMatthieu Gautier <mgautier@fedoraproject.org>2009-04-30 23:19:08 +0200
commitb9ec0c418594803394bd16bc015e0c2970606e86 (patch)
tree7c4bbfed16cf5a59b84f50b171f69d69d173f6b9
parent634bf949864e0185e27538a52505252d2b61962b (diff)
downloadg-ed-it-b9ec0c418594803394bd16bc015e0c2970606e86.zip
g-ed-it-b9ec0c418594803394bd16bc015e0c2970606e86.tar.gz
g-ed-it-b9ec0c418594803394bd16bc015e0c2970606e86.tar.xz
Revert to git-diff.
git-difftool is not yet present in the current version of git (Fedora). Use a git-difftool will be recommit when next git update.
-rw-r--r--g-ed-it/gitAction.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/g-ed-it/gitAction.py b/g-ed-it/gitAction.py
index f25706c..47bd68e 100644
--- a/g-ed-it/gitAction.py
+++ b/g-ed-it/gitAction.py
@@ -51,10 +51,10 @@ class GitAction (object):
def diff_head_index(self,launcher, fileUriMethod = None):
if fileUriMethod : fileUri = fileUriMethod()
- subprocess.call("git-difftool --tool=meld --no-prompt --cached "+os.path.basename(fileUri),stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri), shell=True)
+ subprocess.call("git-diff --cached "+os.path.basename(fileUri),stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri), shell=True)
pass
def diff_index_wt(self, launcher, fileUriMethod = None):
if fileUriMethod : fileUri = fileUriMethod()
- subprocess.call("git-difftool --tool=meld --no-prompt "+os.path.basename(fileUri),stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri), shell=True)
+ subprocess.call("git-diff "+os.path.basename(fileUri),stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri), shell=True)
pass