[PATCH] pretty: Provide a strict ISO8601 date format

It uses the '%aI' and '%cI' format specifiers or the '--date=iso-strict' date format name. See http://article.gmane.org/gmane.comp.version-control.git/255879 for discussion. Signed-off-by: Beat Bolli bbo...@ewanet.ch --- Documentation/git-rev-list.txt | 2 +- Documentation/pretty

[PATCH 2/2] git-gui: remove .git/CHERRY_PICK_HEAD after committing

Adding __git_ps1() to one's bash prompt displays various repo status info after each command. After committing a git cherry-pick -n using git-gui, the prompt still contains the |CHERRY-PICKING flag. Delete the file causing this flag when cleaning up. Signed-off-by: Beat Bolli bbo...@ewanet.ch

[PATCH 1/2] git-gui: Fix a loose/lose mistake

No po update needed, as this string is untranslated. Signed-off-by: Beat Bolli bbo...@ewanet.ch --- git-gui/lib/commit.tcl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl index 0d81432..78c5eeb 100644 --- a/git-gui/lib

Re: [PATCH 1/5] update_unicode.sh: simplify output capture

On 19.12.14 15:39, dev+...@drbeat.li wrote: From: Beat Bolli dev+...@drbeat.li Sorry, it looks like git send-email borked these messages. This line should be part of the mail headers. Regards, Beat Bolli -- https://drbeat.li pgp: 0x506A903A; 49D5 794A EA77 F907 764F D89E 304B 93CF 506A 903A

Re: [PATCH 4/5] update_unicode.sh: Make the output structure visible

On 19.12.14 16:22, Jeff King wrote: On Fri, Dec 19, 2014 at 03:39:30PM +0100, dev+...@drbeat.li wrote: By using printf instead of the echo/uniset sequence, the final structure of the generated file becomes obvious. This whole series looks pretty sane to me, and the result is easier to

Re: [PATCH v2 2/5] update_unicode.sh: set UNICODE_DIR only once

On 22.12.14 19:02, Junio C Hamano wrote: dev+...@drbeat.li writes: From: Beat Bolli dev+...@drbeat.li The value is the same on both uniset invocations, so Don't Repeat Yourself applies. Since we're in a subshell already, there's no need to unset UNICODE_DIR at the end. Strictly

[PATCH] gitk: adjust the menu line numbers to compensate for the new entry

Signed-off-by: Beat Bolli dev+...@drbeat.li Cc: Paul Mackerras pau...@samba.org --- Paul, feel free to squash this commit into my previous one. Signed-off-by: Beat Bolli dev+...@drbeat.li --- gitk-git/gitk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitk-git/gitk b/gitk

Re: [PATCH v4] gitk: Add a Copy commit summary command

On 13.08.15 09:37, Paul Mackerras wrote: On Sat, Jul 18, 2015 at 01:15:39PM +0200, Beat Bolli wrote: When referring to earlier commits in commit messages or other text, one of the established formats is abbrev-sha (summary, author-date) Add a Copy commit summary command to the context

[PATCH v2] gitk: Add a Copy commit summary command

users to create well-formatted commit references. Signed-off-by: Beat Bolli dev+...@drbeat.li Cc: Paul Mackerras pau...@samba.org --- gitk-git/gitk | 14 ++ 1 file changed, 14 insertions(+) diff --git a/gitk-git/gitk b/gitk-git/gitk index 9a2daf3..72a2756 100755 --- a/gitk-git/gitk +++ b

[PATCH v3] gitk: Add a Copy commit summary command

users to create well-formatted commit references. The abbrev-sha is produced with the %h format specifier to make it unique. Its minimum length can be controlled with the config setting core.abbrev. Signed-off-by: Beat Bolli dev+...@drbeat.li Reviewed-by: Eric Sunshine sunsh...@sunshineco.com

Re: [PATCH v2] gitk: Add a Copy commit summary command

On 2015-07-17 10:50, li...@haller-berlin.de wrote: Junio C Hamano gits...@pobox.com wrote: Beat Bolli dev+...@drbeat.li writes: When referring to earlier commits in commit messages or other text, one of the established formats is abbrev-sha (summary, author-date) ... +proc

Re: [PATCH v3] gitk: Add a Copy commit summary command

On 17.07.15 19:28, Junio C Hamano wrote: Eric Sunshine sunsh...@sunshineco.com writes: Signed-off-by: Beat Bolli dev+...@drbeat.li Reviewed-by: Eric Sunshine sunsh...@sunshineco.com Reviewed-by: Johannes Sixt j...@kdbg.org You should drop these Reviewed-by: footers, as they imply

Re: [PATCH v2] gitk: Add a Copy commit summary command

On 18.07.15 14:23, Paul Mackerras wrote: On Fri, Jul 17, 2015 at 08:30:24AM -0700, Junio C Hamano wrote: Paul Mackerras pau...@samba.org writes: We have an item in the preferences menu to control the SHA1 length that is automatically selected when going to a new commit. It's stored in the

[PATCH v4] gitk: Add a Copy commit summary command

. Signed-off-by: Beat Bolli dev+...@drbeat.li Cc: Paul Mackerras pau...@samba.org --- Changes since v3: - consider $autosellen for the --abbrev value Changes since v2: - call git show to produce a unique abbrev-sha - use the short date format Changes since v1: - drop the commit literal in front

Re: [PATCH v4] gitk: Add a Copy commit summary command

On 21.07.15 12:28, Paul Mackerras wrote: On Tue, Jul 21, 2015 at 12:19:23PM +0200, Beat Bolli wrote: Guys, can I get a Yea or Nay for this patch? Does it go in via Paul's gitk repo or directly through Junio? I'll put it in. It goes into my repo and from there into Junio's. I'm

Re: [PATCH v4] gitk: Add a Copy commit summary command

Guys, can I get a Yea or Nay for this patch? Does it go in via Paul's gitk repo or directly through Junio? Thanks, Beat On 18.07.15 13:15, Beat Bolli wrote: When referring to earlier commits in commit messages or other text, one of the established formats is abbrev-sha (summary

Re: gitk fails to start after upgrading to 2.6.3 (cannot load translation)

On 10.11.15 10:48, Peter Krefting wrote: > Hi! > > After upgrading Git to 2.6.3 (from 2.5.0), gitk refuses to start when > trying to load the Swedish translation if I pass it a commit range: The patch can be found here: http://article.gmane.org/gmane.comp.version-control.git/278863 Cheers,

[PATCH, RESEND] gitk: adjust the menu line numbers to compensate for the new entry

Commit d835dbb9 ("gitk: Add a "Copy commit summary" command", 2015-08-13) in the upstream gitk repo added a new context menu entry. Therefore, the line numbers of the entries below the new one need to be adjusted when their text or state is changed. Signed-off-by: Beat Boll

[PATCH] gitk: add missing accelerators

s to unbreak our international users. Signed-off-by: Beat Bolli <dev+...@drbeat.li> Cc: Paul Mackerras <pau...@samba.org> --- gitk-git/gitk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitk-git/gitk b/gitk-git/gitk index 2028b55..fcc606e 100755 --- a/gitk-git/git

[PATCH] git-gui: remove the garbage collection hint

Git core has had automatic garbage collection for a long time. Git-gui does not need a similar heuristic. Signed-off-by: Beat Bolli <dev+...@drbeat.li> Cc: Pat Thoyts <pattho...@users.sourceforge.net> --- git-gui.sh | 3 --- lib/database.tcl | 26 ---

Re: t6023 broken under Mac OS

On 02.01.16 20:35, Junio C Hamano wrote: > Ramsay Jones writes: > >> Hmm, I have never used a Mac, so I'm just guessing here, but >> you could try something like (obviously untested!): >> >> diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh >> index

Re: [PATCH] merge-file: consider core.crlf when writing merge markers

On 24.11.15 23:43, Beat Bolli wrote: > On 24.11.15 09:21, Johannes Schindelin wrote: >> Hi Beat, >> >> On Mon, 23 Nov 2015, Beat Bolli wrote: >> >>> When merging files in repos with core.eol = crlf, git merge-file inserts >>> just a LF at the end of the

Re: [PATCH] merge-file: consider core.crlf when writing merge markers

On 24.11.15 09:21, Johannes Schindelin wrote: > Hi Beat, > > On Mon, 23 Nov 2015, Beat Bolli wrote: > >> When merging files in repos with core.eol = crlf, git merge-file inserts >> just a LF at the end of the merge markers. Files with mixed line endings >> ca

[PATCH] merge-file: consider core.crlf when writing merge markers

uot;binary file matches". Fixing this improves Git's behavior under Windows. Signed-off-by: Beat Bolli <dev+...@drbeat.li> Cc: Johannes Schindelin <johannes.schinde...@gmx.de> --- builtin/merge-file.c | 1 + ll-merge.c| 1 + t/t6023-merge-file.sh | 7 +++ xdi

Re: [PATCH 0/2] Let merge-file write out conflict markers with correct EOLs

On 22.01.16 18:01, Johannes Schindelin wrote: > The original patch was sent by Beat Bolli in > http://thread.gmane.org/gmane.comp.version-control.git/281600 > > My suggestion to extend it to respect gitattributes led to > changes that broke the original patch. > > Since the

Re: [RFC/PATCH] t/perf:

Junio C Hamano pobox.com> writes: > + cd perf && $(MAKE) clean I think the clean way to do this is $(make) -C perf clean Regards, Beat -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at

Re: Bug:

Ilya Tumaykin gmail.com> writes: > $ git --no-pager log -1 --format='format:%+s%+b' > Please fix. Simply use `git --no-pager log -1 --format='format:%+s%n%+b'` The message body excludes the empty line preceding it. -- To unsubscribe from this list: send the line "unsubscribe git" in the

[PATCH 1/2] gitk: align the commit summary format to the documentation

In 175d38c (SubmittingPatches: document how to reference previous commits, 2016-07-28) the format for referring to older commits was specified. Make the text generated by the "Copy commit summary" command match this format. Signed-off-by: Beat Bolli <dev+...@drbeat.li> Cc: Pau

[PATCH 2/2] SubmittingPatches: hint at gitk's "Copy commit summary" command

Amend the section on referencing previous commits with a hint to the gitk command that was added exactly for this purpose. Signed-off-by: Beat Bolli <dev+...@drbeat.li> --- Documentation/SubmittingPatches | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documen

Re: [PATCH 1/2] gitk: align the commit summary format to the documentation

On 26.08.16 21:16, Stefan Beller wrote: > On Fri, Aug 26, 2016 at 11:24 AM, Junio C Hamano <gits...@pobox.com> wrote: >> Beat Bolli <dev+...@drbeat.li> writes: >> >>> In 175d38c (SubmittingPatches: document how to reference previous commits, >>>

Re: [PATCH 1/3] update_unicode.sh: update the uniset repo if it exists

On 12.12.16 19:33, Junio C Hamano wrote: > Torsten Bögershausen writes: > >> If I run ./update_unicode.sh on the latest master of >> https://github.com/depp/uniset.git , commit >> a5fac4a091857dd5429cc2d, I get a diff in unicode_width.h like >> this: >> >> -{ 0x0300, 0x036F }, >>

Re: [PATCH 1/3] update_unicode.sh: update the uniset repo if it exists

On 2016-12-12 06:53, Torsten Bögershausen wrote: On 2016-12-12 00:34, Beat Bolli wrote: We need to track the new commits in uniset, otherwise their and our code get out of sync. Signed-off-by: Beat Bolli <dev+...@drbeat.li> --- Junio, these go on top of my bb/unicode-9.0 branch,

[PATCH v2 5/6] update_unicode.sh: remove the plane filter

The uniset upstream has accepted my patches that eliminate the Unicode plane offsets from the output in '--32' mode. Remove the corresponding filter in update_unicode.sh. This also fixes the issue that the plane offsets were not removed from the second uniset call. Signed-off-by: Beat Bolli

[PATCH v2 3/6] update_unicode.sh: pin the uniset repo to a known good commit

The uniset upstream has added more commits that for example change the hexadecimal output in '--32' mode to decimal. Let's pin the repo to a commit that still outputs the width tables in the format we want. Signed-off-by: Beat Bolli <dev+...@drbeat.li> --- contrib/update-u

[PATCH v2 4/6] update-unicode.sh: automatically download newer definition files

Checking just for the unicode data files' existence is not sufficient; we should also download them if a newer version exists on the Unicode consortium's servers. Option -N of wget does this nicely for us. Reviewed-by: Torsten Bögershausen <tbo...@web.de> Signed-off-by: Beat Boll

[PATCH v2 2/6] update_unicode.sh: remove an unnecessary subshell level

After the move into contrib/update-unicode, we no longer create the unicode directory to have a clean working folder. Instead, the directory of the script is used. This means that the subshell can be removed. Signed-off-by: Beat Bolli <dev+...@drbeat.li> --- contrib/update-u

[PATCH v2 6/6] unicode_width.h: update the width tables to Unicode 9.0

Rerunning update-unicode.sh that we fixed in the previous commits produces these new tables. Signed-off-by: Beat Bolli <dev+...@drbeat.li> --- unicode_width.h | 131 +--- 1 file changed, 107 insertions(+), 24 deletions(-) diff

[PATCH v2 1/6] update_unicode.sh: move it into contrib/update-unicode

As it's used only by a tiny minority of the Git developer population, this script does not belong into the main Git source directory. Move it into contrib/ and adjust the paths to account for the new location. Signed-off-by: Beat Bolli <dev+...@drbeat.li> --- .git

[PATCH v2 0/6] unicode_width.h: update the width tables to Unicode 9.0

This is v2 of my Unicode 9.0 series. After a short discussion [1], we decided to move the generator script into contrib. This is what this series now does first. The script is then updated in contrib. Diff to v1: - complete commit reordering - fix nits in the commit messages .gitignore

Re: [PATCH v4 1/3] update-unicode.sh: automatically download newer definition files

On 05.12.16 21:31, Junio C Hamano wrote: > Torsten Bögershausen <tbo...@web.de> writes: > >> On Sat, Dec 03, 2016 at 10:00:47PM +0100, Beat Bolli wrote: >>> Checking just for the unicode data files' existence is not sufficient; >>> we should also dow

Re: [PATCH v2 4/6] update-unicode.sh: automatically download newer definition files

On 14.12.16 00:31, Beat Bolli wrote: > [PATCH v2 4/6] update-unicode.sh: automatically download newer definition > files Dang! And again I'm not capable of putting an underline instead of the dash... Junio, would you please reword the subject to Re: [PATCH v2 4/6] update_unic

Re: [PATCH 1/3] update_unicode.sh: update the uniset repo if it exists

On 12.12.16 19:12, Torsten Bögershausen wrote: > >>> Minor question, especially to the next commit: >>> Should we make sure to checkout the exact version, which has been tested? >>> In this case cb97792880625e24a9f581412d03659091a0e54f >>> >>> And this is for both a fresh clone and the git pull

[PATCH 1/3] update_unicode.sh: update the uniset repo if it exists

We need to track the new commits in uniset, otherwise their and our code get out of sync. Signed-off-by: Beat Bolli <dev+...@drbeat.li> --- Junio, these go on top of my bb/unicode-9.0 branch, please. Thanks! update_unicode.sh | 5 + 1 file changed, 5 insertions(+) diff

[PATCH 3/3] update_unicode.sh: restore hexadecimal output

The uniset upstream has decided that decimal numbers are The True Way, so let's convert them back to the usual format that's closer to the U+ standard. The generated unicode_widths.h file again looks exactly the same as two commits ago. Signed-off-by: Beat Bolli <dev+...@drbeat

[PATCH 2/3] update_unicode.sh: remove the plane filters

The uniset upstream has accepted my patches that eliminate the Unicode plane offsets from the output in '--32' mode. Remove the corresponding filter in update_unicode.sh. Signed-off-by: Beat Bolli <dev+...@drbeat.li> --- update_unicode.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 del

[PATCH v2 3/3] unicode_width.h: fix the double_width[] table

. Cc: Torsten Bögershausen <tbo...@web.de> Signed-off-by: Beat Bolli <dev+...@drbeat.li> --- Diff to v1: - add Thorsten's Cc: unicode_width.h | 17 - update_unicode.sh | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/unicode_width.h b/uni

[PATCH v2 1/3] update-unicode.sh: automatically download newer definition files

Checking just for the unicode data files' existence is not sufficient; we should also download them if a newer version exists on the Unicode consortium's servers. Option -N of wget does this nicely for us. Cc: Torsten Bögershausen <tbo...@web.de> Signed-off-by: Beat Bolli <dev+...@

[PATCH 3/3] unicode_width.h: fix the double_width[] table

the table. Signed-off-by: Beat Bolli <dev+...@drbeat.li> --- unicode_width.h | 17 - update_unicode.sh | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/unicode_width.h b/unicode_width.h index 73b5fd6..02207be 100644 --- a/unicode_width.h +++ b/unicode_w

[PATCH v4 1/3] update-unicode.sh: automatically download newer definition files

Checking just for the unicode data files' existence is not sufficient; we should also download them if a newer version exists on the Unicode consortium's servers. Option -N of wget does this nicely for us. Reviewed-by: Torsten Boegershausen <tbo...@web.de> Signed-off-by: Beat Boll

[PATCH v4 3/3] unicode_width.h: update the tables to Unicode 9.0

Rerunning update-unicode.sh that we fixed in the two previous commits produces these new tables. Signed-off-by: Beat Bolli <dev+...@drbeat.li> --- unicode_width.h | 131 +--- 1 file changed, 107 insertions(+), 24 deletions(-) diff

[PATCH v4 2/3] update-unicode.sh: strip the plane offsets from the double_width[] table

Bögershausen <tbo...@web.de> Signed-off-by: Beat Bolli <dev+...@drbeat.li> --- update_unicode.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update_unicode.sh b/update_unicode.sh index 3c84270..4c1ec8d 100755 --- a/update_unicode.sh +++ b/update_unicode.sh @@

[PATCH v3 1/3] update-unicode.sh: automatically download newer definition files

Checking just for the unicode data files' existence is not sufficient; we should also download them if a newer version exists on the Unicode consortium's servers. Option -N of wget does this nicely for us. Cc: Torsten Bögershausen <tbo...@web.de> Signed-off-by: Beat Bolli <dev+...@

[PATCH v3 2/3] update-unicode.sh: strip the plane offsets from the double_width[] table

Bögershausen <tbo...@web.de> Signed-off-by: Beat Bolli <dev+...@drbeat.li> --- update_unicode.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update_unicode.sh b/update_unicode.sh index 3c84270..4c1ec8d 100755 --- a/update_unicode.sh +++ b/update_unicode.sh @@ -30,7

[PATCH v3 3/3] unicode_width.h: update the tables to Unicode 9.0

Rerunning update-unicode.sh that we fixed in the two previous commits produces these new tables. Signed-off-by: Beat Bolli <dev+...@drbeat.li> --- unicode_width.h | 131 +--- 1 file changed, 107 insertions(+), 24 deletions(-) diff

Re: [PATCH v3 1/3] update-unicode.sh: automatically download newer definition files

On 03.12.16 17:40, Torsten =?unknown-8bit?Q?B=C3=B6gershausen?= wrote: > On Sat, Dec 03, 2016 at 02:19:31PM +0100, Beat Bolli wrote: >> Checking just for the unicode data files' existence is not sufficient; >> we should also download them if a newer version exists on the Unicode

[PATCH 2/2] unicode: update the tables to Unicode 9.0

A rerun of the previously fixed update-unicode.sh produces these new tables. Signed-off-by: Beat Bolli <dev+...@drbeat.li> --- unicode_width.h | 122 +++- 1 file changed, 111 insertions(+), 11 deletions(-) diff --git a/unicode_wid

[PATCH 1/2] update-unicode.sh: automatically download newer definition files

Checking just for the files' existence is not enough; we should also download them if a newer version exists on the Unicode servers. Signed-off-by: Beat Bolli <dev+...@drbeat.li> --- update_unicode.sh | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/update_unicod

Re: [PATCH v2 1/3] mingw: adjust is_console() to work with stdin

Hi Dscho On 2016-12-23 10:30, Johannes Schindelin wrote: Hi Beat, On Fri, 23 Dec 2016, Beat Bolli wrote: On 22.12.16 18:08, Johannes Schindelin wrote: > diff --git a/compat/winansi.c b/compat/winansi.c > index cb725fb02f..590d61cb1b 100644 > --- a/compat/winansi.c > +++ b/comp

Re: [PATCH v2 1/3] mingw: adjust is_console() to work with stdin

On 22.12.16 18:08, Johannes Schindelin wrote: > When determining whether a handle corresponds to a *real* Win32 Console > (as opposed to, say, a character device such as /dev/null), we use the > GetConsoleOutputBufferInfo() function as a tell-tale. > > However, that does not work for *input*

Re: [PATCH] unicode: update the width tables to Unicode 10

-- „It takes love over gold” — Dire Straits > On 7 Jul 2017, at 17:43, Junio C Hamano <gits...@pobox.com> wrote: > > Beat Bolli <dev+...@drbeat.li> writes: > >> Now that the Unicode 10 has been announced[0], update the character >> width tables to th

[PATCH] unicode: update the width tables to Unicode 10

Now that the Unicode 10 has been announced[0], update the character width tables to the new version. [0] http://blog.unicode.org/2017/06/announcing-unicode-standard-version-100.html Signed-off-by: Beat Bolli <dev+...@drbeat.li> --- unicode_width.

[PATCH] contrib/git-jump: allow to configure the grep command

Add the configuration option "jump.grepCmd" that allows to configure the command that is used to search in grep mode. This allows the users of git-jump to use ag(1) or ack(1) as search engines. Signed-off-by: Beat Bolli <dev+...@drbeat.li> --- contrib/git-jump/README | 3 +++

[PATCH] contrib/git-jump: allow to configure the grep command

Add the configuration option "jump.grepCmd" that allows to configure the command that is used to search in grep mode. This allows the users of git-jump to use ag(1) or ack(1) as search engines. Signed-off-by: Beat Bolli <dev+...@drbeat.li> --- contrib/git-jump/README | 3 +++

[PATCH] t3900: add some more quotes

In 89a70b80 ("t0302 & t3900: add forgotten quotes", 2018-01-03), quotes were added to protect against spaces in $HOME. In the test_when_finished hander, two files are deleted which must be quoted individually. Signed-off-by: Beat Bolli <dev+...@drbeat.li> --- t/t390

[PATCH v2] t3900: add some more quotes

In 89a70b80 ("t0302 & t3900: add forgotten quotes", 2018-01-03), quotes were added to protect against spaces in $HOME. In the test_when_finished handler, two files are deleted which must be quoted individually. Signed-off-by: Beat Bolli <dev+...@drbeat.li> --- Diff to v

[PATCH] git-gui: search for all current SSH key types

-for-windows/git/issues/1487 and subseqently in https://public-inbox.org/git/f65780f29e48994380e2bce87c6f071101146...@deerlm99ex2msx.ww931.my-it-solutions.net/ Signed-off-by: Beat Bolli <dev+...@drbeat.li> --- Cc: Alexander Gavrilov <angavri...@gmail.com> Cc: Pat Th

[PATCH v2 0/1] Pedantic fix for Apple clang

to include this in the next version of the cc/remote-odb topic. Beat Bolli (1): packfile: drop a repeated enum declaration packfile.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.18.0

[PATCH v2] packfile: ensure that enum object_type is defined

n Nieder Signed-off-by: Beat Bolli --- packfile.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packfile.h b/packfile.h index 51383774ec72..28318c5c7c42 100644 --- a/packfile.h +++ b/packfile.h @@ -1,12 +1,12 @@ #ifndef PACKFILE_H #define PACKFILE_H +#include "cac

Re: [PATCH v3 4/4] builtin/rebase: support running "git rebase "

On 17.07.18 23:49, Beat Bolli wrote: > On 06.07.18 14:08, Pratik Karki wrote: >> +static GIT_PATH_FUNC(apply_dir, "rebase-apply"); >> +static GIT_PATH_FUNC(merge_dir, "rebase-merge"); > > Maybe fix this up with > > -static GIT_PATH_FUNC(appl

Re: [PATCH v3 4/4] builtin/rebase: support running "git rebase "

On 06.07.18 14:08, Pratik Karki wrote: > +static GIT_PATH_FUNC(apply_dir, "rebase-apply"); > +static GIT_PATH_FUNC(merge_dir, "rebase-merge"); Maybe fix this up with -static GIT_PATH_FUNC(apply_dir, "rebase-apply"); -static GIT_PATH_FUNC(merge_dir, "rebase-merge"); +static

Re: [PATCH v2] Makefile: add a DEVOPTS flag to get pedantic compilation

On 23.07.18 20:53, Junio C Hamano wrote: > Beat Bolli writes: > >> In the interest of code hygiene, make it easier to compile Git with the >> flag -pedantic. >> >> Pure pedantic compilation with GCC 7.3 results in one warning per use of >> the translation

Re: [PATCH v1] config.c: fix msvc compile error

Hi Jeff On 24.07.18 17:30, g...@jeffhostetler.com wrote: > From: Jeff Hostetler > > In commit fb0dc3bac135e9f6243bd6d293e8c9293c73b9cd code was added > to builtin/config.c to define a new function and a forward declaration > for an array of unknown size. This causes a compile error under MSVC.

Re: [PATCH v1] config.c: fix msvc compile error

On 24.07.18 20:22, Junio C Hamano wrote: > Beat Bolli writes: > >> Hi Jeff >> >> On 24.07.18 17:30, g...@jeffhostetler.com wrote: >>> From: Jeff Hostetler >>> >>> In commit fb0dc3bac135e9f6243bd6d293e8c9293c73b9cd code was added >>>

[PATCH v4] Makefile: add a DEVOPTS flag to get pedantic compilation

the parenthesising of i18n strings with -DUSE_PARENS_AROUND_GETTEXT_N=0. Signed-off-by: Beat Bolli --- Now with -DUSE_PARENS_AROUND_GETTEXT_N=0 instead of =No. This is the convenience knob for all developers that led to the series bb/pedantic[1]. It does not depend on this series, though. [1] https

Re: [PATCH v1] msvc: fix non-standard escape sequence in source

Hi Jeff On 24.07.18 16:42, g...@jeffhostetler.com wrote: > From: Jeff Hostetler > > Replace non-standard "\e" escape sequence with "\x1B". This was already fixed in <20180708144342.11922-4-dev+...@drbeat.li>. Cheers, Beat > > In commit 7a17918c34f4e83982456ffe22d880c3cda5384f a trace

Re: [PATCH v1] config.c: fix msvc compile error

On 24.07.18 20:50, Junio C Hamano wrote: > Beat Bolli writes: > >> On 24.07.18 20:22, Junio C Hamano wrote: >> >>>> This was already fixed (differently) in >>>> <20180705183445.30901-1-dev+...@drbeat.li>. >>> >>> Thanks

[PATCH 0/2] Pedantic fixes for Apple clang

Following up on my previous series bb/pedantic for gcc, here are two fixes for pedantic compilation under MacOS 10.13.6 (High Sierra) with the command line tools of Xcode Version 9.4.1 (9F2000). Beat Bolli (2): packfile: drop a repeated enum declaration remote-odb: un-inline function

[PATCH 2/2] remote-odb: un-inline function remote_odb_reinit

e] Remove the inline specifier that would only make sense if remote_odb_reinit were defined in the header file. Moving it into the header is not possible because the called function remote_odb_do_init is static and thus not visible from the includers of the header. Signed-off-by: Beat Bolli --- remote

[PATCH 1/2] packfile: drop a repeated enum declaration

including packfile.h. Signed-off-by: Beat Bolli --- packfile.h | 1 - 1 file changed, 1 deletion(-) diff --git a/packfile.h b/packfile.h index 51383774ec72..9b6198c4c7e0 100644 --- a/packfile.h +++ b/packfile.h @@ -6,7 +6,6 @@ /* in object-store.h */ struct packed_git; struct object_inf

Re: [PATCH 2/2] remote-odb: un-inline function remote_odb_reinit

Hi Jonathan On 24.07.18 23:59, Jonathan Nieder wrote: > Hi, > > Beat Bolli wrote: > >> When compiling under Apple LLVM version 9.1.0 (clang-902.0.39.2) with >> "make DEVELOPER=1 DEVOPTS=pedantic", the compiler says >> >> remote-odb.c:87

[PATCH] Makefile: add a DEVOPTS flag to get pedantic compilation

. Signed-off-by: Beat Bolli --- This is the convenience knob for all developers that led to the series bb/pedantic[1]. It does not depend on this series, though. [1] https://public-inbox.org/git/20180708144342.11922-1-dev+...@drbeat.li/T/#u Makefile | 4 config.mak.dev | 4 2

[PATCH v2] Makefile: add a DEVOPTS flag to get pedantic compilation

the parenthesising of i18n strings with -DUSE_PARENS_AROUND_GETTEXT_N=no. Signed-off-by: Beat Bolli --- This is the convenience knob for all developers that led to the series bb/pedantic[1]. It does not depend on this series, though. [1] https://public-inbox.org/git/20180708144342.11922-1-dev

[PATCH] fixup! builtin/rebase: support running "git rebase "

The macro GIT_PATH_FUNC expands to a function definition that ends with a closing brace. The extra semicolon produces a warning when compiling with -pedantic. Signed-off-by: Beat Bolli --- Junio, this applies on top of pk/rebase-in-c. Thanks, Beat builtin/rebase.c | 4 ++-- 1 file changed, 2

Re: [PATCH v4] Makefile: add a DEVOPTS flag to get pedantic compilation

On 25.07.18 18:57, Junio C Hamano wrote: > Beat Bolli writes: > >> In the interest of code hygiene, make it easier to compile Git with the >> flag -pedantic. >> >> Pure pedantic compilation with GCC 7.3 results in one warning per use of >> the translation

[PATCH v3] Makefile: add a DEVOPTS flag to get pedantic compilation

the parenthesising of i18n strings with -DUSE_PARENS_AROUND_GETTEXT_N=no. Signed-off-by: Beat Bolli --- Now with -DUSE_PARENS_AROUND_GETTEXT_N=0 instead of =No. This is the convenience knob for all developers that led to the series bb/pedantic[1]. It does not depend on this series, though. [1

Re: [PATCH] builtin/config: work around an unsized array forward declaration

Hi Peff On 05.07.18 21:38, Jeff King wrote: > On Thu, Jul 05, 2018 at 08:34:45PM +0200, Beat Bolli wrote: > >> As reported here[0], Microsoft Visual Studio 2017.2 and "gcc -pedantic" >> don't understand the forward declaration of an unsized static array. >

[PATCH] builtin/config: work around an unsized array forward declaration

th_options() is called with the same arguments. [0]: https://github.com/git-for-windows/git/issues/1735 [1]: https://groups.google.com/forum/#!topic/comp.lang.c.moderated/bmiF2xMz51U Fixes https://github.com/git-for-windows/git/issues/1735 Reported-By: Karen Huang (via GitHub) Signed-off-by:

[RFC PATCH 0/6] Compile cleanly in pedantic mode

While developing 6aaded550 ("builtin/config: work around an unsized array forward declaration", 2018-07-05), I have compiled Git with CFLAGS="-std=c99 -pedantic". This is an RFC patch series that fixes a few compiler warnings when compiling with these options, always assuming that this is a

[RFC PATCH 2/6] refs/refs-internal.h: avoid forward declaration of an enum

Include iterator.h to define enum iterator_selection. Signed-off-by: Beat Bolli --- refs/refs-internal.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/refs/refs-internal.h b/refs/refs-internal.h index dd834314bd..a78b5cb803 100644 --- a/refs/refs-internal.h +++ b/refs/refs-internal.h

[RFC PATCH 6/6] utf8.c: avoid char overflow

In ISO C, char constants must be in the range -128..127. Change the BOM constants to unsigned char to avoid overflow. Signed-off-by: Beat Bolli --- utf8.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/utf8.c b/utf8.c index d55e20c641..833ce00617 100644

[RFC PATCH 4/6] sequencer.c: avoid empty statements at top level

The marco GIT_PATH_FUNC expands to a complete statement including the semicolon. Remove two extra trailing semicolons. Signed-off-by: Beat Bolli --- sequencer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sequencer.c b/sequencer.c index 5354d4d51e..66e7073995 100644

[RFC PATCH 1/6] connect.h: avoid forward declaration of an enum

Include protocol.h to define enum protocol_version. Signed-off-by: Beat Bolli --- connect.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/connect.h b/connect.h index 0e69c6709c..c86f862f2f 100644 --- a/connect.h +++ b/connect.h @@ -1,6 +1,8 @@ #ifndef CONNECT_H #define CONNECT_H

[RFC PATCH 5/6] string-list.c: avoid conversion from void * to function pointer

ISO C forbids the conversion of void pointers to function pointers. Introduce a context struct that encapsulates the function pointer. Signed-off-by: Beat Bolli --- string-list.c | 18 ++ 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/string-list.c b/string

[RFC PATCH 3/6] convert.c: replace "\e" escapes with "\033".

The "\e" escape is not defined in ISO C. While on this line, add a missing space after the comma. Signed-off-by: Beat Bolli --- convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/convert.c b/convert.c index 64d0d30e08..edebb946f5 100644 --- a/conve

Re: [PATCH 0/6] Compile cleanly in pedantic mode

Hi Junio Am 09.07.2018 23:45, schrieb Junio C Hamano: Beat Bolli writes: While developing 6aaded550 ("builtin/config: work around an unsized array forward declaration", 2018-07-05), I have compiled Git with CFLAGS="-std=c99 -pedantic". Nicely done.

Re: [RFC PATCH 2/6] refs/refs-internal.h: avoid forward declaration of an enum

On 09.07.18 20:46, Jeff King wrote: > On Sun, Jul 08, 2018 at 04:43:38PM +0200, Beat Bolli wrote: > >> diff --git a/refs/refs-internal.h b/refs/refs-internal.h >> index dd834314bd..a78b5cb803 100644 >> --- a/refs/refs-internal.h >> +++ b/refs/refs-internal.h

[PATCH] unicode: update the width tables to Unicode 11

Now that Unicode 11 has been announced[0], update the character width tables to the new version. [0] http://blog.unicode.org/2018/06/announcing-unicode-standard-version-110.html Signed-off-by: Beat Bolli --- unicode-width.h | 41 - 1 file changed, 28

[PATCH 5/6] string-list.c: avoid conversion from void * to function pointer

ISO C forbids the conversion of void pointers to function pointers. Introduce a context struct that encapsulates the function pointer. Signed-off-by: Beat Bolli --- string-list.c | 18 ++ 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/string-list.c b/string

[PATCH 4/6] sequencer.c: avoid empty statements at top level

The macro GIT_PATH_FUNC expands to a function definition that ends with a closing brace. Remove two extra semicolons. While at it, fix the example in path.h. Signed-off-by: Beat Bolli --- path.h | 2 +- sequencer.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git

[PATCH 6/6] utf8.c: avoid char overflow

In ISO C, char constants must be in the range -128..127. Change the BOM constants to char literals to avoid overflow. Signed-off-by: Beat Bolli --- utf8.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utf8.c b/utf8.c index d55e20c641..982217eec9 100644 --- a/utf8.c

  1   2   >