Handle branch names with slashes

[stgit] / stgit / commands / files.py

diff --git a/stgit/commands/files.py b/stgit/commands/files.py
index 4b44f72..b33bd2a 100644 (file)
--- a/stgit/commands/files.py
+++ b/stgit/commands/files.py
@@ -37,8 +37,7 @@ options = [make_option('-s', '--stat',
                        help = 'show the diff stat',
                        action = 'store_true'),
            make_option('-b', '--branch',
-                       help = 'use BRANCH instead of the default one')]
-                       action = 'store_true'),
+                       help = 'use BRANCH instead of the default one'),
            make_option('--bare',
                        help = 'bare file names (useful for scripting)',
                        action = 'store_true')]
@@ -54,8 +53,8 @@ def func(parser, options, args):
     else:
         parser.error('incorrect number of arguments')
 
-    rev1 = git_id('%s/bottom' % patch)
-    rev2 = git_id('%s/top' % patch)
+    rev1 = git_id('%s//bottom' % patch)
+    rev2 = git_id('%s//top' % patch)
 
     if options.stat:
         print git.diffstat(rev1 = rev1, rev2 = rev2)