aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-09-14 17:02:44 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-09-19 11:56:41 -0300
commit9c7908624abf838aa0b14a7f94161fe5f753f958 (patch)
treecc940f635798797d0c1f31a92f888666d2c421da
parent.git-blame-ignore-revs: change format to hash then info (diff)
downloadfirejail-9c7908624abf838aa0b14a7f94161fe5f753f958.tar.gz
firejail-9c7908624abf838aa0b14a7f94161fe5f753f958.tar.zst
firejail-9c7908624abf838aa0b14a7f94161fe5f753f958.zip
.git-blame-ignore-revs: add Landlock v1 commits
Commands used to find and print the relevant commits: $ TZ=UTC0 git log --date='format-local:%Y-%m-%d' \ --pretty='%H # %cd | %s' 60db9f785~1..60db9f785 | grep 'Revert "'; git log --reverse --pretty=%b 60db9f785~1..60db9f785 | sed -E -n 's/^This reverts commit ([0-9a-z]+).*/\1/p' | TZ=UTC0 xargs git show --date='format-local:%Y-%m-%d' \ --pretty='%H # %cd | %s' -s | grep -v 'Merge pull request'; TZ=UTC0 git log --no-merges --date='format-local:%Y-%m-%d' \ --pretty='%H # %cd | %s' 54cb3e741~1..54cb3e741 Explanation: The first `git log` basically takes the revision range from one commit before a given merge commit until the merge commit itself and prints the commits in that range (which should usually mean all commits that were in the branch that was merged). In this case, it's the commits that do the revert. The second `git log` finds the hash of all commits that were reverted and prints them. The `grep -v` and third `git log` are only needed because the merge commit of the original branch was reverted directly (on commit 97874c3bf), rather than reverting each individual commit on that branch. So these commands are used to print all of the commits in the original branch. Relates to #5315 #5347.
-rw-r--r--.git-blame-ignore-revs22
1 files changed, 22 insertions, 0 deletions
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 9e40738a1..e380ed26a 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -8,6 +8,28 @@
8# TZ=UTC0 git log --date='format-local:%Y-%m-%d' --pretty='%H # %cd | %s' 8# TZ=UTC0 git log --date='format-local:%Y-%m-%d' --pretty='%H # %cd | %s'
9# [<revision-range>] 9# [<revision-range>]
10 10
11# Landlock v1
1297874c3bf923798b0e3ab119d169aaa9b1314221 # 2022-09-05 | Revert "Merge pull request #5315 from ChrysoliteAzalea/landlock"
13b900bdc87463d79568aef46cb7e3b373fbff84b1 # 2022-09-05 | Revert "compile fix"
14bfcacff665b750ae7b9fc984496df26fcd7cc53d # 2022-09-05 | Revert "tracelog disabled by default in /etc/firejail/firejail.config file"
152a79f3a2689711e6151187063bb55a6af3160b6f # 2022-09-05 | Revert "README/README.md"
1667348ac9c2cdf9d30efbf9fd13eaf0a4adc3be00 # 2022-09-05 | Revert "typos"
170cd20b7e81a7815f57055b38f0746ef14fed2cd0 # 2022-09-05 | Revert "fix syntax in configure.ac"
1826c74796f3c76b8f0ea0b95a863eb707ecced195 # 2022-09-05 | Revert "landlock: check for landlock support in glibc"
195b206611c01e42a6d63c596be45bcf085832b035 # 2022-09-05 | Revert "landlock: support in firejail --version"
202f3c19a87dd49b220f69f27f8c14c627277355d6 # 2022-09-04 | landlock: support in firejail --version
21c5a052ffa4e2ccaf240635db116a49986808a2b6 # 2022-09-04 | landlock: check for landlock support in glibc
222d885e5a091f847d7c2128506947b0f67dd2edab # 2022-09-04 | fix syntax in configure.ac
230594c5d3d0f1ddc4049cf2ed38676a1cdc8d6843 # 2022-08-30 | typos
24796fa09636195d8751a7bbc1e1bc88bf8c3ac95a # 2022-08-30 | README/README.md
256e687c30110a52f267c1779c4eeab82bded9cb77 # 2022-08-29 | tracelog disabled by default in /etc/firejail/firejail.config file
26836ffe37ff891886f15243eacc70963368d57a3f # 2022-08-29 | compile fix
27c6d7474c138f92b3cb3992b5c57750af89eb3b77 # 2022-08-16 | tinyLL has been removed as it's no longer needed
28460fa7a6f98cc1e7aec2953e6523f32677d546c7 # 2022-08-16 | Proposed fixes.
29877fc99d541af83a9486dfff43580e33dedd8b4c # 2022-08-15 | Update quotation marks in src/zsh_completion/_firejail.in
30ba828befe06b99b7dc2d504085cb40aa2d710998 # 2022-08-15 | Landlock functions are added to the code of Firejail, removing the dependency on tinyLL
3161b15442898eeb1db2d23b6b2eb72a705ceb368a # 2022-08-15 | Landlock support has been added.
32
11# "move whitelist/blacklist to allow/deny" 33# "move whitelist/blacklist to allow/deny"
12f43382f1e9707b4fd5e63c7bfe881912aa4ee994 # 2021-07-18 | Revert "move whitelist/blacklist to allow/deny" 34f43382f1e9707b4fd5e63c7bfe881912aa4ee994 # 2021-07-18 | Revert "move whitelist/blacklist to allow/deny"
13fe0f975f447d59977d90c3226cc8c623b31b20b3 # 2021-07-05 | move whitelist/blacklist to allow/deny 35fe0f975f447d59977d90c3226cc8c623b31b20b3 # 2021-07-05 | move whitelist/blacklist to allow/deny