diff options
| -rw-r--r-- | quilt.changes | 7 | ||||
| -rw-r--r-- | quilt/scripts/patchfns.in | 2 | ||||
| -rw-r--r-- | test/edit.test | 20 |
3 files changed, 28 insertions, 1 deletions
diff --git a/quilt.changes b/quilt.changes index 74119a8..fc168c5 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Sat Feb 11 14:28:23 CET 2006 - agruen@suse.de + +- quilt/scripts/patchfns.in: Fix bug in quilt_command when working + in subdirectories. +- Add testcase test/edit.test to catch this kind of bug. + +------------------------------------------------------------------- Wed Feb 8 02:03:27 CET 2006 - agruen@suse.de - bin/patch-wrapper.in: Fix permissions of installed file. diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in index 8402902..a84a911 100644 --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -858,7 +858,7 @@ quilt_command() local command=$1 shift - QUILT_COMMAND="" bash $BASH_OPTS -c ". $QUILT_DIR/$command" "quilt $command" "$@" + QUILT_COMMAND="" bash $BASH_OPTS -c "${SUBDIR:+cd $SUBDIR;} . $QUILT_DIR/$command" "quilt $command" "$@" } # diff --git a/test/edit.test b/test/edit.test new file mode 100644 index 0000000..5cc5dba --- /dev/null +++ b/test/edit.test @@ -0,0 +1,20 @@ +$ rm -rf d +$ mkdir -p d/patches d/subdir +$ cd d + +$ cat > editor +< #! /bin/sh +< echo Editing $1 +< echo foo > $1 +$ chmod +x editor +$ export EDITOR=%PWD/editor + +$ quilt new patch +> Patch patches/patch is now on top +$ cd subdir +$ quilt edit foo +> File subdir/foo added to patch ../patches/patch +> Editing foo + +$ cd ../.. +$ rm -rf d |