Skip to content

Commit 5b281ed

Browse files
Update git to 2.35.2 (#691)
1 parent e91c850 commit 5b281ed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+118
-284
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ apt-get install --yes --no-install-recommends \
3333
rm -rf /var/lib/apt/lists/*
3434
EOF
3535

36-
ARG GIT_VERSION=2.20.1
36+
ARG GIT_VERSION=2.35.2
3737
WORKDIR /usr/src/git
3838
RUN <<EOF
3939
wget https://mirrors.edge.kernel.org/pub/software/scm/git/git-${GIT_VERSION}.tar.gz

tests/filter/ambigous_merge.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$ export TESTTMP=${PWD}
22

33
$ cd ${TESTTMP}
4-
$ git init real_repo 1> /dev/null
4+
$ git init -q real_repo 1> /dev/null
55
$ cd real_repo
66

77
$ mkdir sub2

tests/filter/cmdline.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$ export TESTTMP=${PWD}
22

33
$ cd ${TESTTMP}
4-
$ git init libs 1> /dev/null
4+
$ git init -q libs 1> /dev/null
55
$ cd libs
66

77
$ mkdir sub1
@@ -22,7 +22,7 @@
2222
$ git commit -m "add file3" 1> /dev/null
2323

2424
$ cd ${TESTTMP}
25-
$ git init apps 1> /dev/null
25+
$ git init -q apps 1> /dev/null
2626
$ cd apps
2727

2828
$ git remote add libs ${TESTTMP}/libs

tests/filter/commit_message_raw.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$ export TESTTMP=${PWD}
22

33
$ cd ${TESTTMP}
4-
$ git init testrepo 1> /dev/null
4+
$ git init -q testrepo 1> /dev/null
55
$ cd testrepo
66

77
$ echo contents1 > testfile

tests/filter/deleted_dir.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ in that subtree repo should have an empty tree
44
$ export TESTTMP=${PWD}
55

66
$ cd ${TESTTMP}
7-
$ git init libs 1> /dev/null
7+
$ git init -q libs 1> /dev/null
88
$ cd libs
99

1010
$ mkdir sub1

tests/filter/empty_head.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$ export TESTTMP=${PWD}
22

33
$ cd ${TESTTMP}
4-
$ git init libs 1> /dev/null
4+
$ git init -q libs 1> /dev/null
55
$ cd libs
66

77
$ mkdir sub1

tests/filter/empty_orphan.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Empty root commits from unrelated parts of the tree should not be included
33
$ export TESTTMP=${PWD}
44

55
$ cd ${TESTTMP}
6-
$ git init libs 1>/dev/null
6+
$ git init -q libs 1>/dev/null
77
$ cd libs
88

99
$ mkdir sub1

tests/filter/empty_reimport.t

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$ export TESTTMP=${PWD}
22

33
$ cd ${TESTTMP}
4-
$ git init testrepo 1> /dev/null
4+
$ git init -q testrepo 1> /dev/null
55
$ cd testrepo
66

77
$ echo contents1 > testfile
@@ -70,9 +70,8 @@
7070
| * more change on other 2
7171
| * more change on other
7272
* | more unrelated change on this
73-
* | Merge branch 'other_branch'
74-
|\ \
75-
| |/
73+
* | Merge branch 'other_branch'
74+
|\|
7675
| * change on other 2
7776
| * change on other
7877
* | unrelated change on this

tests/filter/exclude_compose.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$ export TESTTMP=${PWD}
22

33
$ cd ${TESTTMP}
4-
$ git init real_repo 1> /dev/null
4+
$ git init -q real_repo 1> /dev/null
55
$ cd real_repo
66

77
$ mkdir sub1

tests/filter/file.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$ export TESTTMP=${PWD}
22

33
$ cd ${TESTTMP}
4-
$ git init libs 1> /dev/null
4+
$ git init -q libs 1> /dev/null
55
$ cd libs
66

77
$ mkdir sub1

0 commit comments

Comments
 (0)