Fix import to work properly in subdirectories

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

diff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py
index 1c21a745280a4539a434d01a10a5b003226ea66d..cd44d3fa4af913dc44706f7523bd655092cc6001 100644 (file)
--- a/stgit/commands/imprt.py
+++ b/stgit/commands/imprt.py
@@ -279,6 +279,10 @@ def func(parser, options, args):
     else:
         filename = None
 
+    if filename:
+        filename = os.path.abspath(filename)
+    directory.cd_to_topdir()
+
     if options.series:
         __import_series(filename, options)
     elif options.mbox:

diff --git a/t/t1800-import.sh b/t/t1800-import.sh
index 8c8c9a009f0184db8f73f9468cd1c3ffc8e3c35b..624e51c7b53fe045cfabcaf8aa3e6658154bc249 100755 (executable)
--- a/t/t1800-import.sh
+++ b/t/t1800-import.sh
@@ -21,6 +21,17 @@ test_expect_success \
     stg delete ..
     '
 
+test_expect_success \
+    'Apply a patch created with "git diff" from a subdirectory' \
+    '
+    mkdir subdir && cd subdir &&
+    stg import ../../t1800-import/git-diff &&
+    [ $(git cat-file -p $(stg id) \
+        | grep -c "tree e96b1fba2160890ff600b675d7140d46b022b155") = 1 ] &&
+    stg delete .. &&
+    cd ..
+    '
+
 test_expect_success \
     'Apply a patch created with GNU diff' \
     '