From be3e6bd9308ad0b1cae54bd8ff9502bcf7713129 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Thu, 6 Oct 2005 10:57:17 +0100 Subject: [PATCH] Use git_id in import and fold instead of git.rev_parse Organization: Straylight/Edgeware From: Catalin Marinas git_id() is more flexible since it knows about StGIT patches. Signed-off-by: Catalin Marinas --- stgit/commands/fold.py | 2 +- stgit/commands/imprt.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stgit/commands/fold.py b/stgit/commands/fold.py index 963c196..a9bb7fa 100644 --- 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: - git.apply_patch(filename, git.rev_parse(options.base)) + git.apply_patch(filename, git_id(options.base)) else: git.apply_patch(filename) diff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py index 96ba0a1..f8970af 100644 --- 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: - git.apply_patch(filename, git.rev_parse(options.base)) + git.apply_patch(filename, git_id(options.base)) else: git.apply_patch(filename) -- [mdw]