Commit 628ebc5168ca83d87b1d2fd2a0ad4095e47b0af2
2019-01-15T08:56:04
Merge pull request #4937 from lhchavez/fix-crlf Convert tests/resources/push.sh to LF endings
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115
diff --git a/tests/resources/push.sh b/tests/resources/push.sh
index 6071176..3e77fb5 100644
--- a/tests/resources/push.sh
+++ b/tests/resources/push.sh
@@ -1,55 +1,55 @@
-#!/bin/sh
-#creates push_src repo for libgit2 push tests.
-set -eu
-
-#Create src repo for push
-mkdir push_src
-pushd push_src
- git init
-
- echo a > a.txt
- git add .
- git commit -m 'added a.txt'
-
- mkdir fold
- echo b > fold/b.txt
- git add .
- git commit -m 'added fold and fold/b.txt'
-
- git branch b1 #b1 and b2 are the same
- git branch b2
-
- git checkout -b b3
- echo edit >> a.txt
- git add .
- git commit -m 'edited a.txt'
-
- git checkout -b b4 master
- echo edit >> fold\b.txt
- git add .
- git commit -m 'edited fold\b.txt'
-
- git checkout -b b5 master
- git submodule add ../testrepo.git submodule
- git commit -m "added submodule named 'submodule' pointing to '../testrepo.git'"
-
- git checkout master
- git merge -m "merge b3, b4, and b5 to master" b3 b4 b5
-
- #Log commits to include in testcase
- git log --format=oneline --decorate --graph
- #*-. 951bbbb90e2259a4c8950db78946784fb53fcbce (HEAD, master) merge b3, b4, and b5 to master
- #|\ \
- #| | * fa38b91f199934685819bea316186d8b008c52a2 (b5) added submodule named 'submodule' pointing to '../testrepo.git'
- #| * | 27b7ce66243eb1403862d05f958c002312df173d (b4) edited fold\b.txt
- #| |/
- #* | d9b63a88223d8367516f50bd131a5f7349b7f3e4 (b3) edited a.txt
- #|/
- #* a78705c3b2725f931d3ee05348d83cc26700f247 (b2, b1) added fold and fold/b.txt
- #* 5c0bb3d1b9449d1cc69d7519fd05166f01840915 added a.txt
-
- #fix paths so that we can add repo folders under libgit2 repo
- #rename .git to .gitted
- find . -name .git -exec mv -i '{}' '{}ted' \;
- mv -i .gitmodules gitmodules
-popd
+#!/bin/sh
+#creates push_src repo for libgit2 push tests.
+set -eu
+
+#Create src repo for push
+mkdir push_src
+pushd push_src
+ git init
+
+ echo a > a.txt
+ git add .
+ git commit -m 'added a.txt'
+
+ mkdir fold
+ echo b > fold/b.txt
+ git add .
+ git commit -m 'added fold and fold/b.txt'
+
+ git branch b1 #b1 and b2 are the same
+ git branch b2
+
+ git checkout -b b3
+ echo edit >> a.txt
+ git add .
+ git commit -m 'edited a.txt'
+
+ git checkout -b b4 master
+ echo edit >> fold\b.txt
+ git add .
+ git commit -m 'edited fold\b.txt'
+
+ git checkout -b b5 master
+ git submodule add ../testrepo.git submodule
+ git commit -m "added submodule named 'submodule' pointing to '../testrepo.git'"
+
+ git checkout master
+ git merge -m "merge b3, b4, and b5 to master" b3 b4 b5
+
+ #Log commits to include in testcase
+ git log --format=oneline --decorate --graph
+ #*-. 951bbbb90e2259a4c8950db78946784fb53fcbce (HEAD, master) merge b3, b4, and b5 to master
+ #|\ \
+ #| | * fa38b91f199934685819bea316186d8b008c52a2 (b5) added submodule named 'submodule' pointing to '../testrepo.git'
+ #| * | 27b7ce66243eb1403862d05f958c002312df173d (b4) edited fold\b.txt
+ #| |/
+ #* | d9b63a88223d8367516f50bd131a5f7349b7f3e4 (b3) edited a.txt
+ #|/
+ #* a78705c3b2725f931d3ee05348d83cc26700f247 (b2, b1) added fold and fold/b.txt
+ #* 5c0bb3d1b9449d1cc69d7519fd05166f01840915 added a.txt
+
+ #fix paths so that we can add repo folders under libgit2 repo
+ #rename .git to .gitted
+ find . -name .git -exec mv -i '{}' '{}ted' \;
+ mv -i .gitmodules gitmodules
+popd