Re: [PATCH v1 0/3] Update eol documentation

On 25/08/16 22:31, Junio C Hamano wrote: [] This [0/3] is meant to be a cover for [1/2] and [2/2]? I am trying to see if we broke format-patch recently, or it is a manual editing error. The latter I do not care about; the former I do. No worry, 0/3 is patched by me by hand, sorry for th

Re: Working with public-inbox.org [Was: [PATCH] rev-parse: respect core.hooksPath in --git-path]

Hi Arif, On Thu, 25 Aug 2016, Arif Khokar wrote: > On 08/25/2016 09:01 AM, Johannes Schindelin wrote: > > > > On Thu, 25 Aug 2016, Arif Khokar wrote: > > >>> I considered recommending this as some way to improve the review > >>> process. The problem, of course, is that it is very easy to craft

Re: [PATCH v6 03/13] pkt-line: add packet_write_fmt_gently()

> On 25 Aug 2016, at 23:41, Junio C Hamano wrote: > > larsxschnei...@gmail.com writes: > >> From: Lars Schneider >> >> packet_write_fmt() would die in case of a write error even though for >> some callers an error would be acceptable. Add packet_write_fmt_gently() >> which writes a formatted

Re: [PATCH v6 05/13] pkt-line: add packet_write_gently()

> On 25 Aug 2016, at 23:50, Junio C Hamano wrote: > > larsxschnei...@gmail.com writes: > >> From: Lars Schneider >> >> packet_write_fmt() has two shortcomings. First, it uses format_packet() >> which lets the caller only send string data via "%s". That means it >> cannot be used for arbitrary

Re: [PATCH v6 06/13] pkt-line: add functions to read/write flush terminated packet streams

> On 26 Aug 2016, at 00:27, Junio C Hamano wrote: > > larsxschnei...@gmail.com writes: > >> From: Lars Schneider >> >> packet_write_stream_with_flush_from_fd() and >> packet_write_stream_with_flush_from_buf() write a stream of packets. All >> content packets use the maximal packet size except

Re: [PATCH v5 01/12] doc: use 'symmetric difference' consistently

W dniu 11.08.2016 o 23:50, Philip Oakley pisze: > diff --git a/Documentation/rev-list-options.txt > b/Documentation/rev-list-options.txt > index 4f009d4..6dc0bb0 100644 > --- a/Documentation/rev-list-options.txt > +++ b/Documentation/rev-list-options.txt > @@ -225,7 +225,7 @@ excluded from the

Re: [RFC] Proposed questions for "Git User's Survey 2016"

W dniu 26.08.2016 o 08:58, Andrew Ardill pisze: > Jakub Narębski wrote: >> Andrew Ardill pisze: >>> Jakub Narębski wrote: [...] 25. What [channel(s)] do you use to request/get help about Git [(if any)] >>> >>> It may also be useful to ask how people hear news about git, such as >>> when a ne

Re: [RFC] Proposed questions for "Git User's Survey 2016"

W dniu 26.08.2016 o 08:15, Eric Wong pisze: > Not directly-related to the survey questions, but can you ensure > it's accessible to folks without JavaScript/graphics, and > perhaps also ensure it is on a host that is Tor-friendly? I plan on using Survs.com (where we have Premium account for free,

Re: [PATCH 03/15] sequencer: lib'ify do_pick_commit()

Hi Junio, On Thu, 25 Aug 2016, Junio C Hamano wrote: > > if (write_cache_as_tree(head, 0, NULL)) > > - die (_("Your index file is unmerged.")); > > + return error (_("Your index file is unmerged.")); > > While you are touching the line, it is a goo

re

Did you get my message? -- 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 http://vger.kernel.org/majordomo-info.html

Re: [PATCH] checkout: swap the order of ambiguity check for :/ syntax

On Fri, Aug 26, 2016 at 12:19 AM, Junio C Hamano wrote: > Duy Nguyen writes: > >> On Wed, Aug 24, 2016 at 11:35 PM, Junio C Hamano wrote: >>> Nguyễn Thái Ngọc Duy writes: >>> It's not wonderful, but it's in line with how git-checkout stops caring about ambiguity after the first argum

Re: [PATCH 04/15] sequencer: lib'ify prepare_revs()

Hi Junio, On Thu, 25 Aug 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > To be truly useful, the sequencer should never die() but always return > > an error. > > > > Signed-off-by: Johannes Schindelin > > --- > > I am still looking at sequencer.c in 'master', but I do not thin

Re: [PATCH v14 07/27] bisect--helper: `bisect_reset` shell function in C

Hey Junio, On Thu, Aug 25, 2016 at 2:42 AM, Junio C Hamano wrote: > > Pranit Bauva writes: > > > +static int bisect_reset(const char *commit) > > +{ > > + struct strbuf branch = STRBUF_INIT; > > + > > + if (!commit) { > > + if (strbuf_read_file(&branch, git_path_bisect_start(

Re: [PATCH 06/15] sequencer: lib'ify read_populate_todo()

Hi Junio, On Thu, 25 Aug 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > To be truly useful, the sequencer should never die() but always return > > an error. > > > > Signed-off-by: Johannes Schindelin > > --- > > sequencer.c | 14 +- > > 1 file changed, 9 insertion

[PATCH v2 03/14] sequencer: lib'ify write_message()

Instead of dying there, let the caller high up in the callchain notice the error and handle it (by dying, still). The only caller of write_message(), do_pick_commit() already checks the return value and passes it on to its callers, so its caller must be already prepared to handle error returns, an

[PATCH v2 09/14] sequencer: lib'ify read_populate_todo()

Instead of dying there, let the caller high up in the callchain notice the error and handle it (by dying, still). The only caller of read_populate_todo(), sequencer_continue() can already return errors, so its caller must be already prepared to handle error returns, and with this step, we make it

[PATCH v2 05/14] sequencer: lib'ify do_pick_commit()

Instead of dying there, let the caller high up in the callchain notice the error and handle it (by dying, still). The only two callers of do_pick_commit(), pick_commits() and single_pick() already check the return value and pass it on to their callers, so their callers must be already prepared to

[PATCH v2 11/14] sequencer: lib'ify create_seq_dir()

Instead of dying there, let the caller high up in the callchain notice the error and handle it (by dying, still). The only caller of create_seq_dir(), sequencer_pick_revisions() can already return errors, so its caller must be already prepared to handle error returns, and with this step, we make i

[PATCH v2 07/14] sequencer: lib'ify prepare_revs()

Instead of dying there, let the caller high up in the callchain notice the error and handle it (by dying, still). The only caller of prepare_revs(), walk_revs_populate_todo() was just taught to return errors, after verifying that its callers are prepared to handle error returns, and with this step

[PATCH v2 04/14] sequencer: lib'ify do_recursive_merge()

Instead of dying there, let the caller high up in the callchain notice the error and handle it (by dying, still). The only caller of do_recursive_merge(), do_pick_commit() already checks the return value and passes it on to its callers, so its caller must be already prepared to handle error return

[PATCH v2 08/14] sequencer: lib'ify read_and_refresh_cache()

Instead of dying there, let the caller high up in the callchain notice the error and handle it (by dying, still). There are two call sites of read_and_refresh_cache(), one of which is pick_commits(), whose callers were already prepared to do the right thing given an "error" return from it by an ea

[PATCH v2 06/14] sequencer: lib'ify walk_revs_populate_todo()

Instead of dying there, let the caller high up in the callchain notice the error and handle it (by dying, still). The function sequencer_pick_revisions() is the only caller of walk_revs_populate_todo(), and it already returns errors appropriately, so its caller must be already prepared to handle e

[PATCH v2 13/14] sequencer: lib'ify save_todo()

Instead of dying there, let the caller high up in the callchain notice the error and handle it (by dying, still). The only caller of save_todo(), pick_commits() can already return errors, so its caller must be already prepared to handle error returns, and with this step, we make it notice an error

[PATCH v2 14/14] sequencer: lib'ify save_opts()

Instead of dying there, let the caller high up in the callchain notice the error and handle it (by dying, still). The only caller of save_opts(), sequencer_pick_revisions() can already return errors, so its caller must be already prepared to handle error returns, and with this step, we make it not

[PATCH v2 12/14] sequencer: lib'ify save_head()

Instead of dying there, let the caller high up in the callchain notice the error and handle it (by dying, still). The only caller of save_head(), sequencer_pick_revisions() can already return errors, so its caller must be already prepared to handle error returns, and with this step, we make it not

[PATCH v2 10/14] sequencer: lib'ify read_populate_opts()

Instead of dying there, let the caller high up in the callchain notice the error and handle it (by dying, still). The only caller of read_populate_opts(), sequencer_continue() can already return errors, so its caller must be already prepared to handle error returns, and with this step, we make it

[PATCH v2 00/14] Lib'ify quite a few functions in sequencer.c

This patch series is one of the half dozen patch series left to move the bulk of rebase -i into a builtin. The purpose of this patch series is to switch the functions in sequencer.c from die()ing to returning errors instead, as proper library functions should do, to give callers a chance to clean

[PATCH v2 01/14] sequencer: lib'ify sequencer_pick_revisions()

Instead of dying there, let the caller high up in the callchain notice the error and handle it (by dying, still). The function sequencer_pick_revisions() has only two callers, cmd_revert() and cmd_cherry_pick(), both of which check the return value and react appropriately upon errors. So this is

[PATCH v2 02/14] sequencer: do not die() in do_pick_commit()

Instead of dying there, let the caller high up in the callchain notice the error and handle it (by dying, still). The eventual caller of do_pick_commit() is sequencer_pick_revisions(), which already relays a reported error from its helper functions (including this one), and both of its two callers

Re: What's cooking in git.git (Aug 2016, #08; Wed, 24)

Hi Junio, On Wed, 24 Aug 2016, Junio C Hamano wrote: > * rt/help-unknown (2016-08-18) 2 commits > - help: make option --help open man pages only for Git commands > - help: introduce option --command-only > > "git nosuchcommand --help" said "No manual entry for gitnosuchcommand", > which was

Re: Feature Request: Branch-Aware Submodules

> On 25 Aug 2016, at 19:45, Stefan Beller wrote: > > +cc Jacob and Lars who work with submodules as well. > > On Thu, Aug 25, 2016 at 2:00 AM, Hedges Alexander > wrote: >> >> Right now updating a submodule in a topic branch and merging it into master >> will not change the submodule index in

Re: [PATCH v6 06/12] doc: revisions: single vs multi-parent notation comparison

W dniu 13.08.2016 o 01:45, Philip Oakley pisze: > --- a/Documentation/revisions.txt > +++ b/Documentation/revisions.txt > @@ -284,6 +284,10 @@ The 'r1{caret}@' notation means all parents of 'r1'. > The 'r1{caret}!' notation includes commit 'r1' but excludes all of its > parents. > By itself, th

Re: What's cooking in git.git (Aug 2016, #08; Wed, 24)

Johannes Schindelin writes: > On Wed, 24 Aug 2016, Junio C Hamano wrote: > >> * rt/help-unknown (2016-08-18) 2 commits >> - help: make option --help open man pages only for Git commands >> - help: introduce option --command-only >> >> "git nosuchcommand --help" said "No manual entry for gitno

Re: [PATCH v5 01/12] doc: use 'symmetric difference' consistently

Jakub Narębski writes: >> --left-right:: >> -Mark which side of a symmetric diff a commit is reachable from. >> +Mark which side of a symmetric difference a commit is reachable from. >> Commits from the left side are prefixed with `<` and those from >> the right with `>`. If c

Re: [PATCH v6 06/12] doc: revisions: single vs multi-parent notation comparison

Jakub Narębski writes: > W dniu 13.08.2016 o 01:45, Philip Oakley pisze: > >> +'HEAD{caret}2{caret}@', however you cannot say 'HEAD{caret}@{caret}2'. > > Though I do wonder if it is implementation limitation, or if it is something > inherent in the notation, namely that ^@ and ^! resolve (the for

Re: [PATCH v14 07/27] bisect--helper: `bisect_reset` shell function in C

Pranit Bauva writes: >> Also this version fails to catch "bisect reset a b c" as an error, I >> suspect. > > It didn't when I tried it right now. Could you please elaborate on why > you think it can fail? There might be a thing which I haven't tested. My bad. I just compared your bisect_reset()

Re: [PATCH 06/15] sequencer: lib'ify read_populate_todo()

Johannes Schindelin writes: > In short: I would really appreciate it if you could cut quoted text after > your last response. I think you are referring to the patch part in this case. As I was not making point-by-point comments on the proposed commit log message, quoting only that part and cutt

Re: [PATCH v6 06/13] pkt-line: add functions to read/write flush terminated packet streams

On Thu, Aug 25, 2016 at 5:55 PM, Jacob Keller wrote: > On Thu, Aug 25, 2016 at 3:31 PM, Junio C Hamano wrote: >> What is wrong about that? 4*80k = 320kB overhead for length fields >> to transfer 5GB worth of data? I do not think it is worth worrying >> about it. >> >> But I am more surprised by

[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 --- Documentation/SubmittingPatches | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/SubmittingPatches b/Documen

[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 Cc: Paul Mackerras --- gitk-git/gitk | 2 +-

Re: [PATCH v6 03/13] pkt-line: add packet_write_fmt_gently()

Lars Schneider writes: > I agree with your criticism of the code duplication. > > However, I thought it would be OK, as Peff already > tried to refactor it... > http://public-inbox.org/git/20160810150139.lpxyrqkr53s5f...@sigill.intra.peff.net/ > > ... and I got the impression you agreed with Pe

Re: [PATCH v6 05/13] pkt-line: add packet_write_gently()

Lars Schneider writes: >> Do you anticipate future need of non-gently variant of this >> function? If so, perhaps a helper that takes a boolean "am I >> working for the gently variant?" may help share more code. > > With helper you mean "an additional boolean parameter"? I don't > see a need fo

Re: [PATCH v6 06/13] pkt-line: add functions to read/write flush terminated packet streams

Jacob Keller writes: > Stefan's argument to me is thus "If we're already going to ignore > sideband packets here, why not go all the way and make variable length > packets and send a single packet of a maximum length? Doing thus will > solve some set of future problems nicely and makes this code

Re: [PATCH v6 06/13] pkt-line: add functions to read/write flush terminated packet streams

Lars Schneider writes: > OK, what function names would be more clear from your point of view? > > write_packetized_stream_from_fd() > write_packetized_stream_from_buf() > read_packetized_stream_to_buf() Would write_packetized_from_fd() write_packetized_from_buf() read_packetized_to_

Re: [PATCH v6 06/13] pkt-line: add functions to read/write flush terminated packet streams

On Fri, Aug 26, 2016 at 10:02:52AM -0700, Stefan Beller wrote: > Yeah. To me it seems this design explicitly makes it hard for side bands. > As we do not need sidebands for local transfers, this is fine for sure. > > (If we wanted to make it sideband friendly, I'd expect you could register > call

Re: [PATCH v6 03/13] pkt-line: add packet_write_fmt_gently()

On Fri, Aug 26, 2016 at 10:10:50AM -0700, Junio C Hamano wrote: > Lars Schneider writes: > > > I agree with your criticism of the code duplication. > > > > However, I thought it would be OK, as Peff already > > tried to refactor it... > > http://public-inbox.org/git/20160810150139.lpxyrqkr53s5

Re: [PATCH v10 0/9] submodule inline diff format

On Thu, Aug 25, 2016 at 3:46 PM, Jacob Keller wrote: > On Thu, Aug 25, 2016 at 3:38 PM, Junio C Hamano wrote: >> Jacob Keller writes: >> >>> So we should support the gitlink to a repository stored at >>> without stuff inside the .git/modules, and we should support submodule >>> gitlinks with a

Re: [PATCH 07/15] sequencer: lib'ify read_populate_opts()

Johannes Schindelin writes: > -static void read_populate_opts(struct replay_opts **opts_ptr) > +static int read_populate_opts(struct replay_opts **opts) > { > if (!file_exists(git_path_opts_file())) > - return; > - if (git_config_from_file(populate_opts_cb, git_path_opts_fi

Re: [PATCH 12/15] sequencer: lib'ify save_opts()

Johannes Schindelin writes: > static int pick_commits(struct commit_list *todo_list, struct replay_opts > *opts) > @@ -1128,9 +1130,9 @@ int sequencer_pick_revisions(struct replay_opts *opts) > return -1; > if (get_sha1("HEAD", sha1) && (opts->action == REPLAY_REVERT)) >

[PATCH v2 3/3] help: make option --help open man pages only for Git commands

If option --help is passed to a Git command, we try to open the man page of that command. However, we do it for both commands and concepts. Make sure it is an actual command. This makes "git --help" not working anymore, while "git help " still works. Signed-off-by: Ralf Thielow --- Documenta

[PATCH v2 2/3] help: introduce option --exclude-guides

Introduce option --exclude-guides to the help command. With this option being passed, "git help" will open man pages only for actual commands. Since we know it is a command, we can use function help_unknown_command to give the user advice on typos. Helped-by: Johannes Schindelin Signed-off-by:

[PATCH v2 0/3] help: make option --help open man pages only for Git commands

Changes in v2 are: - add a patch from Dscho to make config variable 'help.browser' work on Windows again - rename option "--command-only" to "--exclude-guides" which is less ambiguous in 'help' context - improve test script - refactor usage of argv_array in handle_builtin Johannes Schindelin (1)

[PATCH v2 1/3] Revert "display HTML in default browser using Windows' shell API"

From: Johannes Schindelin Since 4804aab (help (Windows): Display HTML in default browser using Windows' shell API, 2008-07-13), Git for Windows used to call `ShellExecute()` to launch the default Windows handler for `.html` files. The idea was to avoid going through a shell script, for performan

Re: [PATCH v11 5/8] allow do_submodule_path to work even if submodule isn't checked out

Jacob Keller writes: > Currently, do_submodule_path will attempt locating the .git directory by > using read_gitfile on /.git. If this fails it just assumes the > /.git is actually a git directory. > > This is good because it allows for handling submodules which were cloned > in a regular manner

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

Beat Bolli writes: > 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. Hmph. I didn't know gitk already had its o

Re: [PATCH v10 0/9] submodule inline diff format

On Fri, 2016-08-26 at 10:35 -0700, Stefan Beller wrote: > > a) read_gitfile on /.git > > b) if read_gitfile succeeds, use it's contents, otherwise use > > /.git for next steps > > c) check if the resulting file is a git directory, we're fine.. we > > found a gitdir, so stop. > > d) otherwise,  empt

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

Beat Bolli writes: > @@ -124,7 +124,8 @@ archive, summarize the relevant points of the discussion. > If you want to reference a previous commit in the history of a stable > branch use the format "abbreviated sha1 (subject, date)". So for example > like this: "Commit f86a374 (pack-bitmap.c: fix

Re: [PATCH v11 5/8] allow do_submodule_path to work even if submodule isn't checked out

On Fri, 2016-08-26 at 11:19 -0700, Junio C Hamano wrote: > Jacob Keller writes: > > > > > Currently, do_submodule_path will attempt locating the .git > > directory by > > using read_gitfile on /.git. If this fails it just assumes > > the > > /.git is actually a git directory. > > > > This is go

Re: [PATCH v2 2/3] help: introduce option --exclude-guides

Ralf Thielow writes: > Introduce option --exclude-guides to the help command. With this option > being passed, "git help" will open man pages only for actual commands. Let's hide this option from command help of "git help" itself, drop the short-and-sweet "-e", not command-line complete it, and

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

On Fri, Aug 26, 2016 at 11:24 AM, Junio C Hamano wrote: > Beat Bolli writes: > >> 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 m

Re: [PATCH v11 0/8] submodule inline diff format

On Thu, Aug 25, 2016 at 4:32 PM, Jacob Keller wrote: > @@ -487,12 +490,14 @@ static void do_submodule_path(struct strbuf *buf, const > char *path, > strbuf_addstr(buf, git_dir); > } > if (!is_git_directory(buf->buf)) { > + gitmodules_config(); We de

Re: [PATCH v2 2/3] help: introduce option --exclude-guides

Junio C Hamano writes: > Let's hide this option from command help of "git help" itself, drop > the short-and-sweet "-e", not command-line complete it, and leave it > not-mentioned here. > ... > Unless there is a good reason you MUST do so, avoid quoting the test > body with double quotes, as it i

Re: [PATCH v6 08/13] convert: quote filter names in error messages

larsxschnei...@gmail.com writes: > From: Lars Schneider > > Git filter driver commands with spaces (e.g. `filter.sh foo`) are hard to > read in error messages. Quote them to improve the readability. Sounds good. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the bo

Re: [PATCH v6 07/13] pack-protocol: fix maximum pkt-line size

Lars Schneider writes: >> And as this is a strict bug fix of Documentation that makes sense >> outside this series, > > Agreed! Amen. -- 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 http://vger.kernel

Re: [PATCH v11 0/8] submodule inline diff format

On Fri, 2016-08-26 at 12:17 -0700, Stefan Beller wrote: > On Thu, Aug 25, 2016 at 4:32 PM, Jacob Keller om> wrote: > > > > > @@ -487,12 +490,14 @@ static void do_submodule_path(struct strbuf > > *buf, const char *path, > > strbuf_addstr(buf, git_dir); > > } > > if

Re: [PATCH v2 2/3] help: introduce option --exclude-guides

2016-08-26 21:06 GMT+02:00 Junio C Hamano : > Ralf Thielow writes: > >> Introduce option --exclude-guides to the help command. With this option >> being passed, "git help" will open man pages only for actual commands. > > Let's hide this option from command help of "git help" itself, drop > the s

Re: [PATCH v11 0/8] submodule inline diff format

On Fri, Aug 26, 2016 at 07:58:07PM +, Keller, Jacob E wrote: > > >  char *git_pathdup_submodule(const char *path, const char *fmt, > > > ...) > > >  { > > > +   int err; > > > va_list args; > > > struct strbuf buf = STRBUF_INIT; > > > va_start(args, fmt); > > > -   

Re: [PATCH v2 2/3] help: introduce option --exclude-guides

2016-08-26 21:42 GMT+02:00 Junio C Hamano : > Junio C Hamano writes: > > > Taking all of these together, I'll queue this as a proposed fix-up > directly on top of yours. > Thanks! -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.o

Re: [PATCH v6 09/13] convert: modernize tests

larsxschnei...@gmail.com writes: > From: Lars Schneider > > Use `test_config` to set the config, check that files are empty with > `test_must_be_empty`, compare files with `test_cmp`, and remove spaces > after ">" and "<". All of the above are good things to do, but the first one needs to be don

Re: [PATCH v2 2/3] help: introduce option --exclude-guides

Ralf Thielow writes: >>> As we pass a URL, Git won't check if the given path looks like >>> a documentation directory. Another solution would be to create >>> a directory, add a file "git.html" to it and just use this path. >> >> I think this is OK; with s|As we pass a URL|As we pass a string wi

[PATCH v2 0/2] Adjust the documentation to the unified "auto" handling

From: Torsten Bögershausen Changes since v1: - 1/2 is left unchanged - 2/2 is re-written and should be more consistant to read. Torsten Bögershausen (2): git ls-files: text=auto eol=lf is supported in Git 2.10 gitattributes: Document the unified "auto" handling Documentation/git-ls-files.t

[PATCH v2 2/2] gitattributes: Document the unified "auto" handling

From: Torsten Bögershausen Update the documentation about text=auto: text=auto now follows the core.autocrlf handling when files are not normalized in the repository. For a cross platform project recommend the usage of attributes for line-ending conversions. Signed-off-by: Torsten Bögershausen

[PATCH v2 1/2] git ls-files: text=auto eol=lf is supported in Git 2.10

From: Torsten Bögershausen The man page for `git ls-files --eol` mentions the combination of text attributes "text=auto eol=lf" or "text=auto eol=crlf" as not supported yet, but may be in the future. Now they are supported Signed-off-by: Torsten Bögershausen --- Documentation/git-ls-files.txt

Re: [PATCH v2 2/3] help: introduce option --exclude-guides

Ralf Thielow writes: > 2016-08-26 21:42 GMT+02:00 Junio C Hamano : >> Junio C Hamano writes: >> >> >> Taking all of these together, I'll queue this as a proposed fix-up >> directly on top of yours. >> > > Thanks! Thank you for starting this topic. I forgot to add comment on that test://html pa

Re: [PATCH v2 2/3] help: introduce option --exclude-guides

2016-08-26 22:20 GMT+02:00 Junio C Hamano : > > Because the whole thing is inside a double-quote pair, $() and $name > are all interpolated even before test_expect_success is called. > So the above becomes equivalent to > >>> test_expect_success "two commits do not have the same ID" ' >>> g

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 wrote: >> Beat Bolli writes: >> >>> In 175d38c (SubmittingPatches: document how to reference previous commits, >>> 2016-07-28) the format for referring to older commits was specified. >>> >>> Make the text

Re: [PATCH v14 15/27] bisect--helper: retire `--bisect-clean-state` subcommand

Pranit Bauva writes: > The `bisect-clean-state` subcommand is no longer used in the shell > script while the C code uses `bisect_clean_state()` thus remove the > subcommand. Good. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.

Re: [PATCH v2 2/2] gitattributes: Document the unified "auto" handling

tbo...@web.de writes: > From: Torsten Bögershausen > > Update the documentation about text=auto: > text=auto now follows the core.autocrlf handling when files are not > normalized in the repository. > > For a cross platform project recommend the usage of attributes for > line-ending conversions.

Re: [PATCH v14 17/27] bisect--helper: `bisect_autostart` shell function in C

Pranit Bauva writes: > @@ -410,6 +413,7 @@ static int bisect_next(struct bisect_terms *terms, const > char *prefix) > { > int res, no_checkout; > > + bisect_autostart(terms); > /* In case of mistaken revs or checkout error, or signals received, >* "bisect_auto_next" be

Are --first-parent and --ancestry-path compatible rev-list options?

While trying to answer a Stack Overflow question I thought I could contribute to, I've found a scenario that I don't understand that may be a bug. In http://stackoverflow.com/questions/39144006/identify-merge-into-master MvG asked how to find the point at which a commit on a feature branch was

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

Beat Bolli writes: > On 26.08.16 21:16, Stefan Beller wrote: >> I agree we should fix that. > > So would you prepare a amendment to your documentation commit so that > Junio can disregard my two patches? I think the mention of gitk having a feature to easily give you a commit name in the preferr

Re: [PATCH] transport: report missing submodule pushes consistently on stderr

On Wed, Aug 24, 2016 at 9:35 AM, Stefan Beller wrote: > On Wed, Aug 24, 2016 at 3:28 AM, Leandro Lucarella > wrote: >> On Tue, 23 Aug 2016 14:40:08 -0700 >> Stefan Beller wrote: >>> The surrounding advice is printed to stderr, but the list of >>> submodules is not. Make the report consistent by

[PATCH] Documentation/SubmittingPatches: add quotes to advised commit reference

Junio finds it is easier to read text when the commit subject is quoted. Signed-off-by: Stefan Beller --- Documentation/SubmittingPatches | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 500230c..a591229 1

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

On Fri, Aug 26, 2016 at 2:27 PM, Junio C Hamano wrote: > Beat Bolli writes: > >> On 26.08.16 21:16, Stefan Beller wrote: >>> I agree we should fix that. >> >> So would you prepare a amendment to your documentation commit so that >> Junio can disregard my two patches? > > I think the mention of gi

[ANNOUNCE] Git v2.10.0-rc2

A release candidate Git v2.10.0-rc2 is now available for testing at the usual places. It is comprised of 623 non-merge commits since v2.9.0, contributed by 71 people, 22 of which are new faces. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The following pub

Re: [PATCH] Documentation/SubmittingPatches: add quotes to advised commit reference

Stefan Beller writes: > Junio finds it is easier to read text when the commit subject is quoted. > > Signed-off-by: Stefan Beller > --- > Documentation/SubmittingPatches | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/SubmittingPatches b/Documentation/Subm

Re: [PATCH] Documentation/SubmittingPatches: add quotes to advised commit reference

On Fri, Aug 26, 2016 at 3:42 PM, Junio C Hamano wrote: > > Perhaps something like this instead? > > -- >8 -- This is way better. Let's take that. Thanks, Stefan > From: Beat Bolli > Subject: SubmittingPatches: use gitk's "Copy commit summary" format > Date: Fri, 26 Aug 2016 18:59:01 +0200 > >

Re: Are --first-parent and --ancestry-path compatible rev-list options?

"Philip Oakley" writes: > The commit graph. We are looking for F based on knowing J. > > . A - B - C - D -- E -- F -- G - H<-first parent, --merges (C,F,H) > . \ | /\// > . Z | // > . | | | / > . \ \ / / > . I -[J

Re: [PATCH v11 0/8] submodule inline diff format

On Fri, Aug 26, 2016 at 1:04 PM, Jeff King wrote: > On Fri, Aug 26, 2016 at 07:58:07PM +, Keller, Jacob E wrote: > >> > > char *git_pathdup_submodule(const char *path, const char *fmt, >> > > ...) >> > > { >> > > + int err; >> > > va_list args; >> > > struct strbuf buf

Re: [PATCH v14 21/27] bisect--helper: `bisect_log` shell function in C

Pranit Bauva writes: > +static int bisect_log(void) > +{ > + struct strbuf buf = STRBUF_INIT; > + > + if (strbuf_read_file(&buf, git_path_bisect_log(), 256) < 0) { > + strbuf_release(&buf); > + return error(_("We are not bisecting.\n")); > + } > + > + print

Re: [PATCH v11 0/8] submodule inline diff format

From: Jacob Keller > On Fri, Aug 26, 2016 at 1:04 PM, Jeff King wrote: > > On Fri, Aug 26, 2016 at 07:58:07PM +, Keller, Jacob E wrote: > > > >> > > char *git_pathdup_submodule(const char *path, const char *fmt, > >> > > ...) > >> > > { > >> > > + int err; > >> > > va_list ar

Re: [PATCH v14 22/27] bisect--helper: `bisect_replay` shell function in C

Pranit Bauva writes: > +static int get_next_word(struct strbuf *line, struct strbuf *word) > +{ > + int i; > + for (i = 0; line->buf[i] != ' ' && line->buf[i] != '\0'; i++) > + strbuf_addch(word, line->buf[i]); > + > + return 0; > +} This looks like a very non-standard wa

Re: [PATCH v12 12/13] apply: learn to use a different index file

On Thu, Aug 11, 2016 at 10:17 PM, Junio C Hamano wrote: > Christian Couder writes: > >> Sometimes we want to apply in a different index file. >> >> Before the apply functionality was libified it was possible to >> use the GIT_INDEX_FILE environment variable, for this purpose. >> >> But now, as th

Re: [RFC] Proposed questions for "Git User's Survey 2016"

[for some reason this email is not yet present on GMane NNTP interface] On 26 August 2016 at 21:12, David Bainbridge wrote: > Hi Jakub, > > This is excellent news! > > As when you last performed the survey it would be useful for us to be able > to see what the users in our organization (Ericsson)

stable as subset of develop

In a small group, develop is the branch where all fixes/additions/... from topic branches are merged rather dynamically. Thorough testing of commits may lag behind, but when we think one is a pretty good commit we want to identify it as (at least relatively) the latest stable. We could tag it,

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

On Fri, Aug 26, 2016 at 11:27 AM, Junio C Hamano wrote: > Beat Bolli writes: > >> @@ -124,7 +124,8 @@ archive, summarize the relevant points of the discussion. >> If you want to reference a previous commit in the history of a stable >> branch use the format "abbreviated sha1 (subject, date)". S