aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-28 23:42:40 -0700
committerJunio C Hamano <junkio@cox.net>2006-06-28 23:42:40 -0700
commitf38c2a9c9982950109d0eb0802b9713dfffeb18b (patch)
tree4a6eaddf3b13001890946291b595255a13f403e6 /t
parentabc02670169cee9541793a86324a014272ca8ed5 (diff)
parent9fdc3bb5c20e37e410e03ed5b6c71a7e647ccee8 (diff)
downloadgit-f38c2a9c9982950109d0eb0802b9713dfffeb18b.tar.gz
git-f38c2a9c9982950109d0eb0802b9713dfffeb18b.tar.xz
Merge branch 'js/patch'
* js/patch: diff.c: fix get_patch_id() t4014: fix test commit labels. format-patch: use clear_commit_marks() instead of some ad-hockery t4014: fix for whitespace from "wc -l" t4014: add format-patch --ignore-if-in-upstream test format-patch: introduce "--ignore-if-in-upstream" add diff_flush_patch_id() to calculate the patch id
Diffstat (limited to 't')
-rwxr-xr-xt/t4014-format-patch.sh69
1 files changed, 69 insertions, 0 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
new file mode 100755
index 000000000..4795872a7
--- /dev/null
+++ b/t/t4014-format-patch.sh
@@ -0,0 +1,69 @@
+#!/bin/sh
+#
+# Copyright (c) 2006 Junio C Hamano
+#
+
+test_description='Format-patch skipping already incorporated patches'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+
+ for i in 1 2 3 4 5 6 7 8 9 10; do echo "$i"; done >file &&
+ git add file &&
+ git commit -m Initial &&
+ git checkout -b side &&
+
+ for i in 1 2 5 6 A B C 7 8 9 10; do echo "$i"; done >file &&
+ git update-index file &&
+ git commit -m "Side change #1" &&
+
+ for i in D E F; do echo "$i"; done >>file &&
+ git update-index file &&
+ git commit -m "Side change #2" &&
+ git tag C2 &&
+
+ for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >file &&
+ git update-index file &&
+ git commit -m "Side change #3" &&
+
+ git checkout master &&
+ git diff-tree -p C2 | git apply --index &&
+ git commit -m "Master accepts moral equivalent of #2"
+
+'
+
+test_expect_success "format-patch --ignore-if-in-upstream" '
+
+ git format-patch --stdout master..side >patch0 &&
+ cnt=`grep "^From " patch0 | wc -l` &&
+ test $cnt = 3
+
+'
+
+test_expect_success "format-patch --ignore-if-in-upstream" '
+
+ git format-patch --stdout \
+ --ignore-if-in-upstream master..side >patch1 &&
+ cnt=`grep "^From " patch1 | wc -l` &&
+ test $cnt = 2
+
+'
+
+test_expect_success "format-patch result applies" '
+
+ git checkout -b rebuild-0 master &&
+ git am -3 patch0 &&
+ cnt=`git rev-list master.. | wc -l` &&
+ test $cnt = 2
+'
+
+test_expect_success "format-patch --ignore-if-in-upstream result applies" '
+
+ git checkout -b rebuild-1 master &&
+ git am -3 patch1 &&
+ cnt=`git rev-list master.. | wc -l` &&
+ test $cnt = 2
+'
+
+test_done