Re: [PATCH] git-rebase--{interactive,preserve-merges}: fix formatting of todo help message

Hi Johannes Thanks for your detailed answer. On 2018-07-04 at 15:09:34 +0200, Johannes Schindelin wrote: > On Wed, 4 Jul 2018, Tobias Klauser wrote: > > > Part of the todo help message in git-rebase--interactive.sh and > > git-rebase--preserve-merges.sh is unnecessaril

[PATCH] git-rebase--{interactive,preserve-merges}: fix formatting of todo help message

THAT COMMIT WILL BE LOST. # # However, if you remove everything, the rebase will be aborted. # # Note that empty commits are commented out Signed-off-by: Tobias Klauser --- git-rebase--interactive.sh | 4 ++-- git-rebase--preserve-merges.sh | 4 ++-- 2 files changed, 4 insertions

Re: [PATCH] strbuf: Remove unused stripspace function alias

for the old name until > all topic branches had time to switch over. They have had time, so remove > the old alias. > > Signed-off-by: Elijah Newren <new...@gmail.com> Reviewed-by: Tobias Klauser <tklau...@distanz.ch> Thanks!

Re: [PATCH] RelNotes: typo fix in 2.11.0 notes

On 2016-11-29 at 19:35:38 +0100, Junio C Hamano <gits...@pobox.com> wrote: > Tobias Klauser <tklau...@distanz.ch> writes: > > > s/paht/path/ in the "Backwards compatibility notes" section of the > > 2.11.0 release notes. > > > >

[PATCH] RelNotes: typo fix in 2.11.0 notes

s/paht/path/ in the "Backwards compatibility notes" section of the 2.11.0 release notes. Signed-off-by: Tobias Klauser <tklau...@distanz.ch> --- Documentation/RelNotes/2.11.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/RelNot

[PATCH v2] diffcore-delta: remove unused parameter to diffcore_count_changes()

The delta_limit parameter to diffcore_count_changes() has been unused since commit ba23bbc8e ("diffcore-delta: make change counter to byte oriented again.", 2006-03-04). Remove the parameter and adjust all callers. Signed-off-by: Tobias Klauser <tklau...@distanz.ch> --- v2: In th

Re: [PATCH] diffcore-delta: remove unused parameter to diffcore_count_changes()

On 2016-11-04 at 17:37:14 +0100, Jeff King <p...@peff.net> wrote: > On Fri, Nov 04, 2016 at 11:24:36AM +0100, Tobias Klauser wrote: > > > The delta_limit parameter to diffcore_count_changes() has been unused > > since commit c06c79667c95 ("diffcore-rename: some

Re: [PATCH] branch: remove unused parameter to create_branch()

On 2016-11-04 at 17:30:12 +0100, Jeff King <p...@peff.net> wrote: > On Fri, Nov 04, 2016 at 04:19:49PM +0100, Tobias Klauser wrote: > > > The name parameter to create_branch() has been unused since commit > > 55c4a673070f ("Prevent force-updating of the current branc

[PATCH] branch: remove unused parameter to create_branch()

The name parameter to create_branch() has been unused since commit 55c4a673070f ("Prevent force-updating of the current branch"). Remove the parameter and adjust the callers accordingly. Also remove the parameter from the function's documentation comment. Signed-off-by: Tobias Klau

[PATCH] diffcore-delta: remove unused parameter to diffcore_count_changes()

The delta_limit parameter to diffcore_count_changes() has been unused since commit c06c79667c95 ("diffcore-rename: somewhat optimized."). Remove the parameter and adjust all callers. Signed-off-by: Tobias Klauser <tklau...@distanz.ch> --- diff.c| 2 +- diffc

Re: [PATCH] interpret-trailers: add option for in-place editing

On 2016-01-06 at 20:02:23 +0100, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Wed, Jan 6, 2016 at 8:34 AM, Tobias Klauser > <tobias.klau...@zhinst.com> wrote: > > Add a command line option --in-place to support in-place editing akin to > > sed -i. This

[PATCH] interpret-trailers: add option for in-place editing

From: Tobias Klauser <tklau...@distanz.ch> Add a command line option --in-place to support in-place editing akin to sed -i. This allows to write commands like the following: git interpret-trailers --trailer "X: Y" a.txt > b.txt && mv b.txt a.txt in a more co

Re: [PATCH] interpret-trailers: add option for in-place editing

Thanks for your feedback Matthieu! On 2016-01-06 at 15:19:45 +0100, Matthieu Moy <matthieu@grenoble-inp.fr> wrote: > Tobias Klauser <tobias.klau...@zhinst.com> writes: > > > From: Tobias Klauser <tklau...@distanz.ch> > > > > Add a command line opt

Re: [PATCH 1/5] gc: remove unused #include "sigchain.h"

On 2015-10-22 at 22:14:29 +0200, Junio C Hamano <gits...@pobox.com> wrote: > Tobias Klauser <tklau...@distanz.ch> writes: > > > After switching to use the tempfile module in commit ebebeaea (gc: use > > tempfile module to handle gc.pid file), no declaration

[PATCH 3/5] diff: remove unused #include "sigchain.h"

After switching to use the tempfile module in commit 284098f1 (diff: use tempfile module), no declarations from sigchain.h are used in diff.c anymore. Thus, remove the #include. Signed-off-by: Tobias Klauser <tklau...@distanz.ch> --- diff.c | 1 - 1 file changed, 1 deletion(-) diff

[PATCH 2/5] credential-cache--daemon: remove unused #include "sigchain.h"

After switching to use the tempfile module in commit 9e903316 (credential-cache--daemon: use tempfile module), no declarations from sigchain.h are used in credential-cache--daemon.c anymore. Thus, remove the #include. Signed-off-by: Tobias Klauser <tklau...@distanz.ch> --- credential

[PATCH 1/5] gc: remove unused #include "sigchain.h"

After switching to use the tempfile module in commit ebebeaea (gc: use tempfile module to handle gc.pid file), no declarations from sigchain.h are used in builtin/gc.c anymore. Thus, remove the #include. Signed-off-by: Tobias Klauser <tklau...@distanz.ch> --- builtin/gc.c | 1 - 1 file c

[PATCH 5/5] shallow: remove unused #include "sigchain.h"

After switching to use the tempfile module in commit 6e122b44 (setup_temporary_shallow(): use tempfile module), no declarations from sigchain.h are used in read-cache.c anymore. Thus, remove the #include. Signed-off-by: Tobias Klauser <tklau...@distanz.ch> --- shallow.c | 1 - 1 file chan

[PATCH 4/5] read-cache: remove unused #include "sigchain.h"

After switching to use the tempfile module in commit f6ecc62d (write_shared_index(): use tempfile module), no declarations from sigchain.h are used in read-cache.c anymore. Thus, remove the #include. Signed-off-by: Tobias Klauser <tklau...@distanz.ch> --- read-cache.c | 1 - 1 file chan

[PATCH 0/5] Remove unused #include "sigchain.h"

This series removes the #include of sigchain.h from several modules after they were changed to use the tempfile module and they thus no longer use any declarations from sigchain.h Tobias Klauser (5): gc: remove unused #include "sigchain.h" credential-cache--daemon: remove unuse

Re: [PATCH v2 2/4] stripspace: Use parse-options for command-line parsing

On 2015-10-17 at 23:24:13 +0200, Junio C Hamano <gits...@pobox.com> wrote: > Tobias Klauser <tklau...@distanz.ch> writes: > > > On 2015-10-16 at 19:29:35 +0200, Junio C Hamano <gits...@pobox.com> wrote: > >> Junio C Hamano <gits...@pobox.com> wr

Re: [PATCH v2 3/4] stripspace: Implement --count-lines option

On 2015-10-18 at 19:18:53 +0200, Junio C Hamano wrote: > Eric Sunshine writes: > > > Is there any application beyond git-rebase--interactive where a > > --count-lines options is expected to be useful? It's not obvious from > > the commit message that

Re: [PATCH v2 3/4] stripspace: Implement --count-lines option

On 2015-10-18 at 01:57:57 +0200, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Fri, Oct 16, 2015 at 11:16 AM, Tobias Klauser <tklau...@distanz.ch> wrote: > > Implement the --count-lines options for git stripspace [...] > > > > This will make it easier to por

Re: [PATCH v2 2/4] stripspace: Use parse-options for command-line parsing

On 2015-10-16 at 19:07:34 +0200, Junio C Hamano <gits...@pobox.com> wrote: > Tobias Klauser <tklau...@distanz.ch> writes: > > > Use parse-options to parse command-line options instead of a > > hand-crafted implementation. > > > > This is a prep

Re: [PATCH v2 2/4] stripspace: Use parse-options for command-line parsing

On 2015-10-16 at 19:29:35 +0200, Junio C Hamano wrote: > Junio C Hamano writes: > > >> - if (mode == INVAL) > >> - usage(usage_msg); > > > > When given "git stripspace -s blorg", we used to set mode to INVAL > > and then showed the correct usage.

Re: [PATCH v2 0/4] stripspace: Implement and use --count-lines option

On 2015-10-16 at 18:41:31 +0200, Junio C Hamano <gits...@pobox.com> wrote: > Tobias Klauser <tklau...@distanz.ch> writes: > > Be consistent with the subjects, please. > > > strbuf: make stripspace() part of strbuf > > s/make/make/ ;-) > > > s

Re: [PATCH v2 0/4] stripspace: Implement and use --count-lines option

On 2015-10-16 at 18:54:45 +0200, Matthieu Moy <matthieu@grenoble-inp.fr> wrote: > Tobias Klauser <tklau...@distanz.ch> writes: > > > - Split patch 2/3 into two patches: patch 2/4 switches git stripspace > > to use parse-options and patch 3/4 introduces th

Re: [PATCH 2/3] stripspace: Implement --count-lines option

On 2015-10-16 at 19:35:49 +0200, Junio C Hamano <gits...@pobox.com> wrote: > Tobias Klauser <tklau...@distanz.ch> writes: > > >> So this is your output code, which gives only the number of lines > >> without the cleaned up result. > > > > This sh

Re: [PATCH 2/3] stripspace: Implement --count-lines option

On 2015-10-15 at 18:52:54 +0200, Matthieu Moy <matthieu@grenoble-inp.fr> wrote: > Tobias Klauser <tklau...@distanz.ch> writes: > > > --- a/Documentation/git-stripspace.txt > > +++ b/Documentation/git-stripspace.txt > > @@ -9,7 +9,7 @@ git-strips

Re: [PATCH 1/3] strbuf: make stripspace() part of strbuf

Thanks for the review. On 2015-10-15 at 19:36:17 +0200, Junio C Hamano <gits...@pobox.com> wrote: > Tobias Klauser <tklau...@distanz.ch> writes: > > > Rename stripspace() to strbuf_stripspace() and move it to the strbuf > > module as suggested in [1]. > &g

Re: [PATCH 1/3] strbuf: make stripspace() part of strbuf

On 2015-10-15 at 18:42:23 +0200, Matthieu Moy <matthieu@grenoble-inp.fr> wrote: > Tobias Klauser <tklau...@distanz.ch> writes: > > > Also switch all current users of stripspace() to the new function name > > and keep a temporary wrapper inline function for

Re: [PATCH 2/3] stripspace: Implement --count-lines option

On 2015-10-15 at 18:52:54 +0200, Matthieu Moy <matthieu@grenoble-inp.fr> wrote: > Tobias Klauser <tklau...@distanz.ch> writes: > > +static const char * const usage_msg[] = { > > Stick the * to usage_msg please. Just noticed while looking at how other sub-com

[PATCH v2 0/4] stripspace: Implement and use --count-lines option

ion. - Adjust commit messages to not include links to the wiki, fully describe the motivation in the commit message instead. Tobias Klauser (4): strbuf: make stripspace() part of strbuf stripspace: Use parse-options for command-line parsing stripspace: Implement --count-lines option git reb

[PATCH v2 3/4] stripspace: Implement --count-lines option

easier to port git-rebase--interactive.sh to C later on. Furthermore, add the corresponding documentation and tests. Signed-off-by: Tobias Klauser <tklau...@distanz.ch> --- Implements the small project idea from https://git.wiki.kernel.org/index.php/SmallProjectsIdeas#implement_.27--count-

[PATCH v2 2/4] stripspace: Use parse-options for command-line parsing

Use parse-options to parse command-line options instead of a hand-crafted implementation. This is a preparatory patch to simplify the introduction of the --count-lines option in a follow-up patch. Signed-off-by: Tobias Klauser <tklau...@distanz.ch> --- builtin/stripspace.

[PATCH v2 1/4] strbuf: make stripspace() part of strbuf

the corresponding prefix to its name. Also switch all current users of stripspace() to the new function name and keep a temporary wrapper inline function for any topic branches still using stripspace(). Reviewed-by: Matthieu Moy <matthieu@imag.fr> Signed-off-by: Tobias Klauser <tklau...@d

[PATCH v2 4/4] git rebase -i: Use newly added --count-lines option for stripspace

Use the newly added --count-lines option for 'git stripspace' to count lines instead of piping the entire output to 'wc -l'. Signed-off-by: Tobias Klauser <tklau...@distanz.ch> --- Implements the small project idea from https://git.wiki.kernel.org/index.php/SmallProjectsIdeas#impleme

[PATCH 0/3] stripspace: Implement and use --count-lines option

... | wc -l with: git stripspace --count-lines ... Tobias Klauser (3): strbuf: make stripspace() part of strbuf stripspace: Implement --count-lines option git rebase -i: Use newly added --count-lines option for stripspace Documentation/git-stripspace.txt | 13 - builtin/am.c

[PATCH 1/3] strbuf: make stripspace() part of strbuf

/index.php/SmallProjectsIdeas#make_.27stripspace.28.29.27_part_of_strbuf Signed-off-by: Tobias Klauser <tklau...@distanz.ch> --- builtin/am.c | 2 +- builtin/branch.c | 2 +- builtin/commit.c | 6 ++--- builtin/merge.c | 2 +- builtin/notes.c | 6 ++--- b

[PATCH 2/3] stripspace: Implement --count-lines option

unt-lines < infile This will also make it easier to port git-rebase--interactive.sh to C later on. Furthermore, add the corresponding documentation and tests. [1] https://git.wiki.kernel.org/index.php/SmallProjectsIdeas#implement_.27--count-lines.27_in_.27git_stripspace.27 Signed-off-by:

[PATCH 3/3] git rebase -i: Use newly added --count-lines option for stripspace

Use the newly added --count-lines option for 'git stripspace' to count lines instead of piping the entire output to 'wc -l'. Signed-off-by: Tobias Klauser <tklau...@distanz.ch> --- git-rebase--interactive.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-

Re: [PATCH] pretend_sha1_file(): Change return type from int to void

On 2015-10-07 at 23:22:59 +0200, Junio C Hamano wrote: > Johannes Schindelin writes: > > > As to the patch, I cannot speak for Junio, of course, but my > > preference would be to keep the return type. Traditionally, functions > > that can fail

Re: [PATCH] pretend_sha1_file(): Change return type from int to void

Hi Johannes On 2015-10-06 at 16:30:36 +0200, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > On 2015-10-06 15:51, Tobias Klauser wrote: > > > On 2015-10-06 at 15:16:12 +0200, Johannes Schindelin > > <johannes.schinde...@gmx.de> wrote: > >> &

[PATCH] Documentation/interpret-trailers: Grammar fix

Signed-off-by: Tobias Klauser <tklau...@distanz.ch> --- Documentation/git-interpret-trailers.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index d6d9231..0ecd497

[PATCH] pretend_sha1_file(): Change return type from int to void

prented_sha1_file() always returns 0 and its only callsite in builtin/blame.c doesn't use the return value, so change the return type to void. Signed-off-by: Tobias Klauser <tklau...@distanz.ch> --- cache.h | 2 +- sha1_file.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-)

Re: [PATCH] pretend_sha1_file(): Change return type from int to void

Hi Johannes Thanks for your feedback. On 2015-10-06 at 15:16:12 +0200, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > Hi Tobias, > > On 2015-10-06 14:15, Tobias Klauser wrote: > > prented_sha1_file() always returns 0 and its only callsite in > >

[PATCH] connect: Fix typo in result string of prot_name()

Replace 'unkown' with 'unknown'. Signed-off-by: Tobias Klauser <tklau...@distanz.ch> --- connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect.c b/connect.c index c0144d8..777f31c 100644 --- a/connect.c +++ b/connect.c @@ -254,7 +254,7 @@ static cons