diff options
| -rw-r--r-- | builtin-apply.c | 7 | ||||
| -rwxr-xr-x | t/t4128-apply-root.sh | 52 | ||||
| -rw-r--r-- | t/test-lib.sh | 2 |
3 files changed, 60 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index f1f675819f..cfd8fceb90 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -805,6 +805,13 @@ static int parse_git_header(char *line, int len, unsigned int size, struct patch * the default name from the header. */ patch->def_name = git_header_name(line, len); + if (patch->def_name && root) { + char *s = xmalloc(root_len + strlen(patch->def_name) + 1); + strcpy(s, root); + strcpy(s + root_len, patch->def_name); + free(patch->def_name); + patch->def_name = s; + } line += len; size -= len; diff --git a/t/t4128-apply-root.sh b/t/t4128-apply-root.sh index 2dd0c75f96..bc7a8a8689 100755 --- a/t/t4128-apply-root.sh +++ b/t/t4128-apply-root.sh @@ -40,4 +40,56 @@ test_expect_success 'apply --directory -p (2) ' ' ' +cat > patch << EOF +diff --git a/newfile b/newfile +new file mode 100644 +index 0000000..d95f3ad +--- /dev/null ++++ b/newfile +@@ -0,0 +1 @@ ++content +EOF + +test_expect_success 'apply --directory (new file)' ' + git reset --hard initial && + git apply --directory=some/sub/dir/ --index patch && + test content = $(git show :some/sub/dir/newfile) && + test content = $(cat some/sub/dir/newfile) +' + +cat > patch << EOF +diff --git a/delfile b/delfile +deleted file mode 100644 +index d95f3ad..0000000 +--- a/delfile ++++ /dev/null +@@ -1 +0,0 @@ +-content +EOF + +test_expect_success 'apply --directory (delete file)' ' + git reset --hard initial && + echo content >some/sub/dir/delfile && + git add some/sub/dir/delfile && + git apply --directory=some/sub/dir/ --index patch && + ! git ls-files | grep delfile +' + +cat > patch << 'EOF' +diff --git "a/qu\157tefile" "b/qu\157tefile" +new file mode 100644 +index 0000000..d95f3ad +--- /dev/null ++++ "b/qu\157tefile" +@@ -0,0 +1 @@ ++content +EOF + +test_expect_success 'apply --directory (quoted filename)' ' + git reset --hard initial && + git apply --directory=some/sub/dir/ --index patch && + test content = $(git show :some/sub/dir/quotefile) && + test content = $(cat some/sub/dir/quotefile) +' + test_done diff --git a/t/test-lib.sh b/t/test-lib.sh index fb89741125..8936173ee2 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -112,7 +112,7 @@ if test -n "$color"; then *) test -n "$quiet" && return;; esac shift - printf "* $*" + printf "* %s" "$*" tput sgr0 echo ) |