Remove redundant newlines, add .idea to gitignore

* Add .idea/ to git ignored directories. * Remove redundant newline. * Remove redundant newline. * Remove redundant newlines. * Remove redundant newline. * Remove redundant newline. * Add missing newline at end of file. * Remove redundant newline. * Remove redundant newlines.
2026-06-08 02:31:18 -03:00 · 2024-12-29 15:31:03 +01:00
parent 6f9ca42a30
commit 9cea5e0732
11 changed files with 4 additions and 14 deletions
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -20,7 +20,6 @@ linux_task:
        #   container:
        #       <<: *step
        #       image: ghcr.io/krobelus/fish-ci/focal-32bit:latest
-
    tests_script:
        # cirrus at times gives us 32 procs and 2 GB of RAM
        # Unrestriced parallelism results in OOM
@@ -30,7 +29,6 @@ linux_task:
        - cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCTEST_PARALLEL_LEVEL=6 ..
        - ninja -j 6 fish
        - ninja fish_run_tests
-
    only_if: $CIRRUS_REPO_OWNER == 'fish-shell'

 linux_arm_task:
@@ -41,7 +39,6 @@ linux_arm_task:
        - name: jammy-armv7-32bit
          arm_container:
              image: ghcr.io/fish-shell/fish-ci/jammy-armv7-32bit
-
    tests_script:
        # cirrus at times gives us 32 procs and 2 GB of RAM
        # Unrestriced parallelism results in OOM
@@ -52,7 +49,6 @@ linux_arm_task:
        - ninja -j 6 fish
        - file ./fish
        - ninja fish_run_tests
-
    # CI task disabled during RIIR transition
    only_if: false && $CIRRUS_REPO_OWNER == 'fish-shell'

@@ -92,5 +88,4 @@ freebsd_task:
        - sudo -u fish-user -s cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCTEST_PARALLEL_LEVEL=1 ..
        - sudo -u fish-user sh -c '. $HOME/.cargo/env; ninja -j 6 fish'
        - sudo -u fish-user sh -c '. $HOME/.cargo/env; ninja fish_run_tests'
-
    only_if: $CIRRUS_REPO_OWNER == 'fish-shell'
--- a/.gitignore
+++ b/.gitignore
@@ -102,3 +102,6 @@ target/

 # Generated by clangd
 /.cache
+
+# JetBrains editors.
+.idea/
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -126,4 +126,3 @@ enforcement ladder](https://github.com/mozilla/diversity).
 For answers to common questions about this code of conduct, see the FAQ at
 https://www.contributor-covenant.org/faq. Translations are available at
 https://www.contributor-covenant.org/translations.
-
--- a/1
+++ b/1
@@ -16,4 +16,3 @@ WORKDIR /src
 RUN cmake3 . &&\
  make &&\
  make install
-
--- a/benchmarks/benchmarks/load_completions.fish
+++ b/benchmarks/benchmarks/load_completions.fish
@@ -8,5 +8,4 @@ for file in *.fish
            echo FAILING FILE $file
        end
    end
-
 end
--- a/build_tools/osx_package_resources/welcome.html
+++ b/build_tools/osx_package_resources/welcome.html
@@ -8,7 +8,6 @@
 			code, tt {
 				font-family: ui-monospace, Menlo, monospace;
 			}
-
 		</style>
 	</head>
 	<body>
--- a/deny.toml
+++ b/deny.toml
@@ -19,4 +19,4 @@ allow = [

 [sources.allow-org]
 # 1 or more github.com organizations to allow git sources for
-github = ["fish-shell"]
+github = ["fish-shell"]
--- a/docker/focal-arm64.Dockerfile
+++ b/docker/focal-arm64.Dockerfile
@@ -36,5 +36,4 @@ WORKDIR /home/fishuser

 COPY fish_run_tests.sh /

-
 CMD /fish_run_tests.sh
--- a/docker/jammy-armv7-32bit.Dockerfile
+++ b/docker/jammy-armv7-32bit.Dockerfile
@@ -38,5 +38,4 @@ WORKDIR /home/fishuser

 COPY fish_run_tests.sh /

-
 CMD /fish_run_tests.sh
--- a/docker/jammy.Dockerfile
+++ b/docker/jammy.Dockerfile
@@ -35,5 +35,4 @@ WORKDIR /home/fishuser

 COPY fish_run_tests.sh /

-
 CMD /fish_run_tests.sh
--- a/osx/fish_debug.entitlements
+++ b/osx/fish_debug.entitlements
@@ -6,4 +6,3 @@
         <true/>
 </dict>
 </plist>
-