diff options
| author | Nadav Cohen <nadavcoh@gmail.com> | 2016-05-01 19:06:39 -0700 |
|---|---|---|
| committer | Nadav Cohen <nadavcoh@gmail.com> | 2016-05-17 00:08:01 -0700 |
| commit | e81592e07692284aab607e959096030027067695 (patch) | |
| tree | 5e4e1dbc115f592b2acc6790edcd9c3b638d09a3 /org.eclipse.jgit.test/tst-rsrc | |
| parent | 00db4ab06ea5411732ca77cebc823d90cc59e372 (diff) | |
| download | jgit-e81592e07692284aab607e959096030027067695.tar.gz jgit-e81592e07692284aab607e959096030027067695.zip | |
Allow setting FileMode to executable when applying patches in ApplyCommand
git-apply allows modifying file modes in patched files using either
"new mode" or "new file mode" headers. This patch adds support for
setting files as executables and vice-versa.
Change-Id: I24848966b46f686f540a8efa8150b42e0d9c3ad1
Signed-off-by: Nadav Cohen <nadavcoh@gmail.com>
Diffstat (limited to 'org.eclipse.jgit.test/tst-rsrc')
8 files changed, 40 insertions, 0 deletions
diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M1.patch b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M1.patch new file mode 100644 index 0000000000..395bd4c503 --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M1.patch @@ -0,0 +1,9 @@ +diff --git a/M1 b/M1 +new file mode 100755 +index 0000000..de98044 +--- /dev/null ++++ b/M1 +@@ -0,0 +1,3 @@ ++a ++b ++c diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M1_PostImage b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M1_PostImage new file mode 100644 index 0000000000..de980441c3 --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M1_PostImage @@ -0,0 +1,3 @@ +a +b +c diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M2.patch b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M2.patch new file mode 100644 index 0000000000..b56ca0828e --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M2.patch @@ -0,0 +1,10 @@ +diff --git a/M2 b/M2 +old mode 100644 +new mode 100755 +index 0000000..de98044 +--- a/M2 ++++ b/M2 +@@ -1,3 +1,1 @@ + a +-b +-c diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M2_PostImage b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M2_PostImage new file mode 100644 index 0000000000..7898192261 --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M2_PostImage @@ -0,0 +1 @@ +a diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M2_PreImage b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M2_PreImage new file mode 100644 index 0000000000..de980441c3 --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M2_PreImage @@ -0,0 +1,3 @@ +a +b +c diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M3.patch b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M3.patch new file mode 100644 index 0000000000..ee536058ab --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M3.patch @@ -0,0 +1,10 @@ +diff --git a/M3 b/M3 +old mode 100755 +new mode 100644 +index 0000000..de98044 +--- a/M3 ++++ b/M3 +@@ -1,1 +1,3 @@ + a ++b ++c diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M3_PostImage b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M3_PostImage new file mode 100644 index 0000000000..de980441c3 --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M3_PostImage @@ -0,0 +1,3 @@ +a +b +c diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M3_PreImage b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M3_PreImage new file mode 100755 index 0000000000..7898192261 --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/M3_PreImage @@ -0,0 +1 @@ +a |