From: Johan Walles <johan.walles@gmail.com>
To: git@vger.kernel.org
Subject: Chunk header @@@ counts wrong?
Date: Thu, 2 May 2024 18:51:47 +0200 [thread overview]
Message-ID: <CAKtyTbevS7W-X4qoO=uPnHmXCEtKhqycD8DZZY-oK-z0p4CEAQ@mail.gmail.com> (raw)
Are these counts produced by git 2.44.0 correct, and in that case how?
The header says "@@@ -6,6 -6,60 +6,60 @@@", meaning "six rows in v1,
sixty in v2 and sixty in the merge result".
I think v2 contains 57 lines, but git says 60. What am I missing?
I'm counting:
* 6 space-space (context) lines
* 51 plus-space (new to v1 but already in v2) lines
* 3 plus-plus (new to both v1 and v2) lines
Doesn't this mean that v2 contains 57 (51 plus-space + 6 context) lines?
Why does git say that v2 contains 60 lines?
Originally reported here: https://github.com/walles/riff/issues/63
Regards /Johan
"
diff --cc ansible/roles/zfsbootmenu/tasks/main.yaml
index 73fa864,08648fa..0000000
--- a/ansible/roles/zfsbootmenu/tasks/main.yaml
+++ b/ansible/roles/zfsbootmenu/tasks/main.yaml
@@@ -6,6 -6,60 +6,60 @@@
- zfsbootmenu
state: present
++<<<<<<< HEAD
++=======
+ - name: Create ESP mdadm config
+ template:
+ src: mdadm.conf.j2
+ dest: /etc/mdadm.conf
+ owner: root
+ group: root
+ mode: 0644
+ when: esp_mdadm_array is defined
+
+ - name: Install dropbear
+ xbps:
+ pkg:
+ - dropbear
+ - mkinitcpio-dropbear
+ state: present
+
+ - name: Create dropbear directory
+ file:
+ path: /etc/dropbear
+ owner: root
+ group: root
+ mode: 0755
+ state: directory
+
+ - name: Create dropbear keys
+ command:
+ cmd: /usr/bin/dropbearkey -t {{ item }} -f
/etc/dropbear/dropbear_{{ item }}_host_key
+ creates: /etc/dropbear/dropbear_{{ item }}_host_key
+ loop:
+ - rsa
+ - ecdsa
+ - ed25519
+
+ - name: Create dropbear authorised keys
+ template:
+ src: authorized_keys.j2
+ dest: /etc/dropbear/root_key
+ owner: root
+ group: root
+ mode: 0644
+ lstrip_blocks: true
+
+ - name: Create dropbear config
+ template:
+ src: dropbear.conf.j2
+ dest: /etc/dropbear/dropbear.conf
+ owner: root
+ group: root
+ mode: 0644
+ lstrip_blocks: true
+
++>>>>>>> 8eec118 (fixup! ansible/roles/zfsbootmenu: add role)
- name: Create zfsbootmenu config
template:
src: config.yaml.j2
* Unmerged path ansible/host_vars/foo.yaml
"
next reply other threads:[~2024-05-02 16:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-02 16:51 Johan Walles [this message]
2024-05-02 20:43 ` Chunk header @@@ counts wrong? Junio C Hamano
2024-05-02 20:47 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAKtyTbevS7W-X4qoO=uPnHmXCEtKhqycD8DZZY-oK-z0p4CEAQ@mail.gmail.com' \
--to=johan.walles@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).