diff options
Diffstat (limited to 'tests/concat-git-diff')
| -rw-r--r-- | tests/concat-git-diff | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/tests/concat-git-diff b/tests/concat-git-diff index 52d3004..927eb5a 100644 --- a/tests/concat-git-diff +++ b/tests/concat-git-diff @@ -12,20 +12,29 @@ use_tmpdir # ============================================================== +echo zero > f + cat > concatenated.diff <<EOF diff --git a/f b/f -new file mode 100644 -index 0000000..5626abf ---- /dev/null +index 26af6a8..5626abf 100644 +--- a/f +++ b/f -@@ -0,0 +1 @@ +@@ -1 +1 @@ +-zero +one diff --git a/f b/f -index 5626abf..f719efd 100644 +deleted file mode 100644 +index 5626abf..0000000 --- a/f -+++ b/f -@@ -1 +1 @@ ++++ /dev/null +@@ -1 +0,0 @@ -one +diff --git a/f b/f +new file mode 100644 +index 0000000..f719efd +--- /dev/null ++++ b/f +@@ -0,0 +1 @@ +two diff --git a/f b/f index f719efd..2bdf67a 100644 @@ -40,6 +49,7 @@ check 'patch -p1 < concatenated.diff || echo "Status: $?"' <<EOF patching file f patching file f patching file f +patching file f EOF check 'cat f' <<EOF |