[PATCH olang v1 0/2] chore: ignore *.orig files

[PATCH olang v1 0/2] chore: ignore *.orig files

[Johnny Richard]

These files has been commited by mistake. We should ignore them.

Johnny Richard (2):
  chore: remove .orig file
  chore: ignore *.orig file on root .gitignore

 .gitignore                                 |  1 +
 tests/olc/0026_primitive_unsigneds.ol.orig | 27 ----------------------
 2 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 tests/olc/0026_primitive_unsigneds.ol.orig


base-commit: dbbfdf2acab2b022cc9f0157d4341478d82b8838
-- 
2.46.0

Re: [PATCH olang v1 0/2] chore: ignore *.orig files

[Carlos Maniero]

Approved! Thanks.

To git.sr.ht:~johnnyrichard/olang
   5a3c6d8..3c8975b  main -> main

[PATCH olang v1 1/2] chore: remove .orig file

[Johnny Richard]

This file has been integrated by mistake.  This is a file generated by
git when a merge conflict happens.

Signed-off-by: Johnny Richard <johnny@johnnyrichard.com>
---
 tests/olc/0026_primitive_unsigneds.ol.orig | 27 ----------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 tests/olc/0026_primitive_unsigneds.ol.orig

diff --git a/tests/olc/0026_primitive_unsigneds.ol.orig b/tests/olc/0026_primitive_unsigneds.ol.orig
deleted file mode 100644
index 25f0f7e..0000000
--- a/tests/olc/0026_primitive_unsigneds.ol.orig
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (C) 2024 olang mantainers
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-fn main(): u64 {
-  var a: u8 = 255
-  var b: u16 = 65535
-  var c: u32 = 4294967295
-  var d: u64 = 4294967296
-
-  return a + b + c + d - a - b - c - d
-}
-
-# TEST test_compile(exit_code=0)
-
-# TEST test_run_binary(exit_code=0)
-- 
2.46.0

[PATCH olang v1 2/2] chore: ignore *.orig file on root .gitignore

[Johnny Richard]

Signed-off-by: Johnny Richard <johnny@johnnyrichard.com>
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index f18560c..54f5c40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,6 @@
 build
 *.o
 *.info
+*.orig
 docs/site.tar.gz
 tests/*/*_test
-- 
2.46.0

[olang/patches/.build.yml] build success

[builds.sr.ht]

olang/patches/.build.yml: SUCCESS in 21s

[chore: ignore *.orig files][0] from [Johnny Richard][1]

[0]: https://lists.sr.ht/~johnnyrichard/olang-devel/patches/55383
[1]: mailto:johnny@johnnyrichard.com

✓ #1346429 SUCCESS olang/patches/.build.yml https://builds.sr.ht/~johnnyrichard/job/1346429