Re: [PATCH v5 2/3] merge: replace atoi() with strtol_i() for marker size validation

[PATCH 0/3] R atoi · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-12
[PATCH 1/3] t3404: avoid losing exit status with focus on `git show` and `git cat-file` · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-12
Re: [PATCH 1/3] t3404: avoid losing exit status with focus on `git show` and `git cat-file` · Taylor Blau <hidden> · 2024-10-14
[PATCH 2/3] t3404: replace test with test_line_count() · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-12
Re: [PATCH 2/3] t3404: replace test with test_line_count() · Taylor Blau <hidden> · 2024-10-14
[PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-12
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi <hidden> · 2024-10-13
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Phillip Wood <hidden> · 2024-10-14
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi <hidden> · 2024-10-14
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Patrick Steinhardt <hidden> · 2024-10-14
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Phillip Wood <hidden> · 2024-10-14
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Patrick Steinhardt <hidden> · 2024-10-14
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Phillip Wood <hidden> · 2024-10-14
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi <hidden> · 2024-10-14
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi <hidden> · 2024-10-14
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · <hidden> · 2024-10-14
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi <hidden> · 2024-10-15
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Taylor Blau <hidden> · 2024-10-15
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi <hidden> · 2024-10-16
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · <hidden> · 2024-10-15
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Phillip Wood <hidden> · 2024-10-16
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi <hidden> · 2024-10-16
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi <hidden> · 2024-10-17
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Patrick Steinhardt <hidden> · 2024-10-17
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi <hidden> · 2024-10-17
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi <hidden> · 2024-10-14
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Phillip Wood <hidden> · 2024-10-14
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Kristoffer Haugsbakk <hidden> · 2024-10-14
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Phillip Wood <hidden> · 2024-10-14
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi <hidden> · 2024-10-14
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · <hidden> · 2024-10-14
Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi <hidden> · 2024-10-17
[PATCH v2 0/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-18
[PATCH v2 1/3] daemon: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-18
Re: [PATCH v2 1/3] daemon: replace atoi() with strtoul_ui() and strtol_i() · Patrick Steinhardt <hidden> · 2024-10-21
Re: [PATCH v2 1/3] daemon: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi <hidden> · 2024-10-21
Re: [PATCH v2 1/3] daemon: replace atoi() with strtoul_ui() and strtol_i() · Taylor Blau <hidden> · 2024-10-21
Re: [PATCH v2 1/3] daemon: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi <hidden> · 2024-10-21
[PATCH v2 2/3] merge: replace atoi() with strtol_i() for marker size validation · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-18
Re: [PATCH v2 2/3] merge: replace atoi() with strtol_i() for marker size validation · Patrick Steinhardt <hidden> · 2024-10-21
Re: [PATCH v2 2/3] merge: replace atoi() with strtol_i() for marker size validation · Usman Akinyemi <hidden> · 2024-10-21
Re: [PATCH v2 2/3] merge: replace atoi() with strtol_i() for marker size validation · Taylor Blau <hidden> · 2024-10-21
Re: [PATCH v2 2/3] merge: replace atoi() with strtol_i() for marker size validation · Usman Akinyemi <hidden> · 2024-10-21
Re: [PATCH v2 2/3] merge: replace atoi() with strtol_i() for marker size validation · Usman Akinyemi <hidden> · 2024-10-21
Re: [PATCH v2 2/3] merge: replace atoi() with strtol_i() for marker size validation · Taylor Blau <hidden> · 2024-10-21
Re: [PATCH v2 2/3] merge: replace atoi() with strtol_i() for marker size validation · Phillip Wood <hidden> · 2024-10-30
Re: [PATCH v2 2/3] merge: replace atoi() with strtol_i() for marker size validation · Usman Akinyemi <hidden> · 2024-10-30
Re: [PATCH v2 2/3] merge: replace atoi() with strtol_i() for marker size validation · Phillip Wood <hidden> · 2024-10-31
Re: [PATCH v2 2/3] merge: replace atoi() with strtol_i() for marker size validation · Usman Akinyemi <hidden> · 2024-10-31
Re: [PATCH v2 2/3] merge: replace atoi() with strtol_i() for marker size validation · Usman Akinyemi <hidden> · 2024-11-06
Re: [PATCH v2 2/3] merge: replace atoi() with strtol_i() for marker size validation · <hidden> · 2024-11-06
[PATCH v2 3/3] imap: replace atoi() with strtol_i() for UIDVALIDITY and UIDNEXT parsing · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-18
Re: [PATCH v2 3/3] imap: replace atoi() with strtol_i() for UIDVALIDITY and UIDNEXT parsing · Patrick Steinhardt <hidden> · 2024-10-21
Re: [PATCH v2 3/3] imap: replace atoi() with strtol_i() for UIDVALIDITY and UIDNEXT parsing · Usman Akinyemi <hidden> · 2024-10-21
Re: [PATCH v2 3/3] imap: replace atoi() with strtol_i() for UIDVALIDITY and UIDNEXT parsing · Patrick Steinhardt <hidden> · 2024-10-21
Re: [PATCH v2 3/3] imap: replace atoi() with strtol_i() for UIDVALIDITY and UIDNEXT parsing · Usman Akinyemi <hidden> · 2024-10-21
Re: [PATCH v2 3/3] imap: replace atoi() with strtol_i() for UIDVALIDITY and UIDNEXT parsing · Taylor Blau <hidden> · 2024-10-21
Re: [PATCH v2 3/3] imap: replace atoi() with strtol_i() for UIDVALIDITY and UIDNEXT parsing · Usman Akinyemi <hidden> · 2024-10-21
Re: [PATCH v2 3/3] imap: replace atoi() with strtol_i() for UIDVALIDITY and UIDNEXT parsing · Usman Akinyemi <hidden> · 2024-10-22
Re: [PATCH v2 0/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Taylor Blau <hidden> · 2024-10-18
Re: [PATCH v2 0/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi <hidden> · 2024-10-18
Re: [PATCH v2 0/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Taylor Blau <hidden> · 2024-10-18
Re: [PATCH v2 0/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi <hidden> · 2024-10-18
[PATCH v3 0/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-22
[PATCH v3 1/3] daemon: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-22
Re: [PATCH v3 1/3] daemon: replace atoi() with strtoul_ui() and strtol_i() · Taylor Blau <hidden> · 2024-10-22
Re: [PATCH v3 1/3] daemon: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi <hidden> · 2024-10-22
[PATCH v3 2/3] merge: replace atoi() with strtol_i() for marker size validation · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-22
[PATCH v3 3/3] imap: replace atoi() with strtol_i() for UIDVALIDITY and UIDNEXT parsing · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-22
[PATCH v4 0/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-22
[PATCH v4 1/3] daemon: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-22
[PATCH v4 2/3] merge: replace atoi() with strtol_i() for marker size validation · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-22
[PATCH v4 3/3] imap: replace atoi() with strtol_i() for UIDVALIDITY and UIDNEXT parsing · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-22
Re: [PATCH v4 3/3] imap: replace atoi() with strtol_i() for UIDVALIDITY and UIDNEXT parsing · Patrick Steinhardt <hidden> · 2024-10-23
Re: [PATCH v4 3/3] imap: replace atoi() with strtol_i() for UIDVALIDITY and UIDNEXT parsing · Usman Akinyemi <hidden> · 2024-10-23
[PATCH v5 0/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-23
[PATCH v5 1/3] daemon: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-23
Re: [PATCH v5 1/3] daemon: replace atoi() with strtoul_ui() and strtol_i() · Taylor Blau <hidden> · 2024-10-23
Re: [PATCH v5 1/3] daemon: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi <hidden> · 2024-10-24
[PATCH v5 2/3] merge: replace atoi() with strtol_i() for marker size validation · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-23
Re: [PATCH v5 2/3] merge: replace atoi() with strtol_i() for marker size validation · Taylor Blau <hidden> · 2024-10-23
Re: [PATCH v5 2/3] merge: replace atoi() with strtol_i() for marker size validation · Usman Akinyemi <hidden> · 2024-10-24
[PATCH v5 3/3] imap: replace atoi() with strtol_i() for UIDVALIDITY and UIDNEXT parsing · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-23
Re: [PATCH v5 0/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Patrick Steinhardt <hidden> · 2024-10-23
Re: [PATCH v5 0/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Taylor Blau <hidden> · 2024-10-23
Re: [PATCH v5 0/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi <hidden> · 2024-10-24
[PATCH v6 0/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-24
[PATCH v6 1/3] daemon: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-24
[PATCH v6 2/3] merge: replace atoi() with strtol_i() for marker size validation · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-24
[PATCH v6 3/3] imap: replace atoi() with strtol_i() for UIDVALIDITY and UIDNEXT parsing · Usman Akinyemi via GitGitGadget <hidden> · 2024-10-24
Re: [PATCH v6 0/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Taylor Blau <hidden> · 2024-10-24
Re: [PATCH v6 0/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Patrick Steinhardt <hidden> · 2024-10-25
Re: [PATCH v6 0/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Usman Akinyemi <hidden> · 2024-10-25
Re: [PATCH v6 0/3] parse: replace atoi() with strtoul_ui() and strtol_i() · Taylor Blau <hidden> · 2024-10-25

From: Taylor Blau <hidden>
Date: 2024-10-23 20:32:30

On Wed, Oct 23, 2024 at 07:40:19AM +0000, Usman Akinyemi via GitGitGadget wrote:

quoted hunk ↗ jump to hunk

diff --git a/t/t6406-merge-attr.sh b/t/t6406-merge-attr.sh
index 9bf95249347..c2a9cf03808 100755
--- a/t/t6406-merge-attr.sh
+++ b/t/t6406-merge-attr.sh

@@ -118,6 +118,12 @@ test_expect_success 'retry the merge with longer context' '
 	grep "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" actual
 '

+test_expect_success 'invalid conflict-marker-size 3a' '
+    echo "text conflict-marker-size=3a" >>.gitattributes &&
+    git checkout -m text 2>error &&
+    test_grep "warning: invalid marker-size ${SQ}3a${SQ}, expecting an integer" error
+'
+

Do subsequent tests further down in this script depend on .gitattributes
not having invalid lines? If so, you may want to instead write:

    cp .gitattributes .gitattributes.bak &&
    echo "text conflict-marker-size=3a" >>.gitattributes &&
    test_when_finished "mv .gitattributes.bak .gitattributes" &&

instead.

Thanks,
Taylor

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help