diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/t/t4034 | |
parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/t/t4034')
-rw-r--r-- | third_party/git/t/t4034/dts/expect | 37 | ||||
-rw-r--r-- | third_party/git/t/t4034/dts/post | 32 | ||||
-rw-r--r-- | third_party/git/t/t4034/dts/pre | 32 |
3 files changed, 0 insertions, 101 deletions
diff --git a/third_party/git/t/t4034/dts/expect b/third_party/git/t/t4034/dts/expect deleted file mode 100644 index 560fc9918476..000000000000 --- a/third_party/git/t/t4034/dts/expect +++ /dev/null @@ -1,37 +0,0 @@ -<BOLD>diff --git a/pre b/post<RESET> -<BOLD>index b6a9051..7803aee 100644<RESET> -<BOLD>--- a/pre<RESET> -<BOLD>+++ b/post<RESET> -<CYAN>@@ -1,32 +1,32 @@<RESET> -/ {<RESET> - <RED>this_handle<RESET><GREEN>HANDLE_2<RESET>: <RED>node<RESET><GREEN>new-node<RESET>@<RED>f00<RESET><GREEN>eeda<RESET> { - compatible = "<RED>mydev<RESET><GREEN>vendor,compat<RESET>"; - string-prop = <RED>start<RESET><GREEN>end<RESET>: "hello <RED>world!<RESET><GREEN>world?<RESET>" <RED>end<RESET><GREEN>start<RESET>: ; - <RED>#size-cells<RESET><GREEN>#address-cells<RESET> = <<RED>0+0<RESET><GREEN>0+40<RESET>>; - reg = <<RED>0xf00<RESET><GREEN>0xeeda<RESET>>; - prop = <<GREEN>(<RESET>1<GREEN>)<RESET>>; - prop = <<GREEN>(<RESET>-1e10<GREEN>)<RESET>>; - prop = <(!<RED>3<RESET><GREEN>1<RESET>)>; - prop = <(~<RED>3<RESET><GREEN>1<RESET>)>; - prop = <(<RED>3<RESET><GREEN>1<RESET>*<RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>3<RESET><GREEN>1<RESET>&<RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>3<RESET><GREEN>1<RESET>*<RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>3<RESET><GREEN>1<RESET>/<RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>3<RESET><GREEN>1<RESET>%<RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>3+4<RESET><GREEN>1+2<RESET>)>; - prop = <(<RED>3-4<RESET><GREEN>1-2<RESET>)>; - prop = /bits/ <RED>64<RESET><GREEN>32<RESET> <(<RED>3<RESET><GREEN>1<RESET><<<RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>3<RESET><GREEN>1<RESET>>><RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>3<RESET><GREEN>1<RESET>&<RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>3<RESET><GREEN>1<RESET>^<RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>3<RESET><GREEN>1<RESET>|<RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>3<RESET><GREEN>1<RESET>&&<RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>3<RESET><GREEN>1<RESET>||<RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>4?5<RESET><GREEN>1?2<RESET>:3)>; - list = <&<RED>this_handle<RESET><GREEN>HANDLE_2<RESET>>, <0 0 0 <RED>0<RESET><GREEN>1<RESET>>; - };<RESET> - - &<RED>phandle<RESET><GREEN>phandle2<RESET> { - <RED>pre-phandle<RESET><GREEN>prop_handle<RESET> = <&<RED>this_handle<RESET><GREEN>HANDLE_2<RESET>>; - };<RESET> -};<RESET> diff --git a/third_party/git/t/t4034/dts/post b/third_party/git/t/t4034/dts/post deleted file mode 100644 index 7803aee28093..000000000000 --- a/third_party/git/t/t4034/dts/post +++ /dev/null @@ -1,32 +0,0 @@ -/ { - HANDLE_2: new-node@eeda { - compatible = "vendor,compat"; - string-prop = end: "hello world?" start: ; - #address-cells = <0+40>; - reg = <0xeeda>; - prop = <(1)>; - prop = <(-1e10)>; - prop = <(!1)>; - prop = <(~1)>; - prop = <(1*2)>; - prop = <(1&2)>; - prop = <(1*2)>; - prop = <(1/2)>; - prop = <(1%2)>; - prop = <(1+2)>; - prop = <(1-2)>; - prop = /bits/ 32 <(1<<2)>; - prop = <(1>>2)>; - prop = <(1&2)>; - prop = <(1^2)>; - prop = <(1|2)>; - prop = <(1&&2)>; - prop = <(1||2)>; - prop = <(1?2:3)>; - list = <&HANDLE_2>, <0 0 0 1>; - }; - - &phandle2 { - prop_handle = <&HANDLE_2>; - }; -}; diff --git a/third_party/git/t/t4034/dts/pre b/third_party/git/t/t4034/dts/pre deleted file mode 100644 index b6a905113c22..000000000000 --- a/third_party/git/t/t4034/dts/pre +++ /dev/null @@ -1,32 +0,0 @@ -/ { - this_handle: node@f00 { - compatible = "mydev"; - string-prop = start: "hello world!" end: ; - #size-cells = <0+0>; - reg = <0xf00>; - prop = <1>; - prop = <-1e10>; - prop = <(!3)>; - prop = <(~3)>; - prop = <(3*4)>; - prop = <(3&4)>; - prop = <(3*4)>; - prop = <(3/4)>; - prop = <(3%4)>; - prop = <(3+4)>; - prop = <(3-4)>; - prop = /bits/ 64 <(3<<4)>; - prop = <(3>>4)>; - prop = <(3&4)>; - prop = <(3^4)>; - prop = <(3|4)>; - prop = <(3&&4)>; - prop = <(3||4)>; - prop = <(4?5:3)>; - list = <&this_handle>, <0 0 0 0>; - }; - - &phandle { - pre-phandle = <&this_handle>; - }; -}; |