aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-10-12 13:21:17 -0700
committerShawn O. Pearce <spearce@spearce.org>2008-10-12 13:21:17 -0700
commit5c283eb13c94be6ca974aa722159dc9838d10d97 (patch)
treee10f2dfa699ffe69b2b5e9a215c905b76ee4e77c /t
parentb75271d93a9e4be960d53fc4f955802530e0e733 (diff)
parent72d404debaa804fca82fd9cf710fbde48c7305c6 (diff)
downloadgit-5c283eb13c94be6ca974aa722159dc9838d10d97.tar.gz
git-5c283eb13c94be6ca974aa722159dc9838d10d97.tar.xz
Merge branch 'maint'
* maint: test-lib: fix broken printf git apply --directory broken for new files
Diffstat (limited to 't')
-rwxr-xr-xt/t4128-apply-root.sh52
-rw-r--r--t/test-lib.sh2
2 files changed, 53 insertions, 1 deletions
diff --git a/t/t4128-apply-root.sh b/t/t4128-apply-root.sh
index 2dd0c75f9..bc7a8a868 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 fb8974112..8936173ee 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
)