[meld/meld-3-18] vc.git: Fix ambiguous argument when checking unpushed commits (#233)



commit 54427ac521357dcc2cfbddd1574f067bb4c437b4
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Oct 28 06:01:08 2018 +1000

    vc.git: Fix ambiguous argument when checking unpushed commits (#233)
    
    In a situation where file/folder and branch are named the same, our
    helper that checks for unpushed commits on the branch ends us emitting
    an ambiguous git command line.

 meld/vc/git.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/meld/vc/git.py b/meld/vc/git.py
index 9165d9f4..072d4ec8 100644
--- a/meld/vc/git.py
+++ b/meld/vc/git.py
@@ -118,7 +118,7 @@ class Vc(_vc.Vc):
             except ValueError:
                 continue
 
-            proc = self.run("rev-list", branch, "^" + remote)
+            proc = self.run("rev-list", branch, "^" + remote, "--")
             revisions = proc.stdout.read().split("\n")[:-1]
             branch_revisions[branch] = revisions
         return branch_revisions


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