Use git_id in import and fold instead of git.rev_parse

git_id() is more flexible since it knows about StGIT patches.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/stgit/commands/fold.py b/stgit/commands/fold.py
index 963c1967c8dd028132c17944d7c9f6bcf603b279..a9bb7fa715c6d337780b1010ac563e24f3e9ede0 100644 (file)
--- a/stgit/commands/fold.py
+++ b/stgit/commands/fold.py
@@ -70,7 +70,7 @@ def func(parser, options, args):
         bottom = crt_patch.get_bottom()
         git.apply_patch(filename, bottom)
     elif options.base:
         bottom = crt_patch.get_bottom()
         git.apply_patch(filename, bottom)
     elif options.base:

-        git.apply_patch(filename, git.rev_parse(options.base))
+        git.apply_patch(filename, git_id(options.base))

     else:
         git.apply_patch(filename)
 
     else:
         git.apply_patch(filename)
 

diff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py
index 96ba0a174ef039ce92dba40acf99337f6d9cf900..f8970afc0cc598a312875096f12e3f7dfae00d39 100644 (file)
--- a/stgit/commands/imprt.py
+++ b/stgit/commands/imprt.py
@@ -220,7 +220,7 @@ def func(parser, options, args):
     sys.stdout.flush()
 
     if options.base:
     sys.stdout.flush()
 
     if options.base:

-        git.apply_patch(filename, git.rev_parse(options.base))
+        git.apply_patch(filename, git_id(options.base))

     else:
         git.apply_patch(filename)
 
     else:
         git.apply_patch(filename)