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

2016-08-26 Thread Jacob Keller
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

stable as subset of develop

2016-08-26 Thread Brett Porter
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

2016-08-26 Thread Ali Saeed
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

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

2016-08-26 Thread Johannes Schindelin
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()

2016-08-26 Thread Johannes Schindelin
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 03/14] sequencer: lib'ify write_message()

2016-08-26 Thread Johannes Schindelin
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,

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

2016-08-26 Thread Johannes Schindelin
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 11/14] sequencer: lib'ify create_seq_dir()

2016-08-26 Thread Johannes Schindelin
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

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

2016-08-26 Thread Johannes Schindelin
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

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

2016-08-26 Thread Lars Schneider
> 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

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

2016-08-26 Thread Johannes Schindelin
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

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

2016-08-26 Thread Pranit Bauva
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

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

2016-08-26 Thread Johannes Schindelin
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 > > --- > >

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

2016-08-26 Thread Johannes Schindelin
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

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

2016-08-26 Thread Johannes Schindelin
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

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

2016-08-26 Thread Johannes Schindelin
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: [PATCH 04/15] sequencer: lib'ify prepare_revs()

2016-08-26 Thread Johannes Schindelin
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

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

2016-08-26 Thread Duy Nguyen
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

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

2016-08-26 Thread Johannes Schindelin
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

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

2016-08-26 Thread Johannes Schindelin
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

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

2016-08-26 Thread Johannes Schindelin
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

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

2016-08-26 Thread Johannes Schindelin
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

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

2016-08-26 Thread Johannes Schindelin
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

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

2016-08-26 Thread Johannes Schindelin
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

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

2016-08-26 Thread Johannes Schindelin
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

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

2016-08-26 Thread Lars Schneider
> 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 >>

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

2016-08-26 Thread Jakub Narębski
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

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

2016-08-26 Thread Jakub Narębski
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

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

2016-08-26 Thread Lars Schneider
> 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".

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

2016-08-26 Thread Jakub Narębski
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: Working with public-inbox.org [Was: [PATCH] rev-parse: respect core.hooksPath in --git-path]

2016-08-26 Thread Johannes Schindelin
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

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

2016-08-26 Thread Ralf Thielow
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

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

2016-08-26 Thread Ralf Thielow
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

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

2016-08-26 Thread Keller, Jacob E
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,  

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

2016-08-26 Thread Junio C Hamano
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

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

2016-08-26 Thread 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 short-and-sweet "-e", not

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

2016-08-26 Thread Junio C Hamano
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) &&

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

2016-08-26 Thread Ralf Thielow
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

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

2016-08-26 Thread Ralf Thielow
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

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

2016-08-26 Thread Junio C Hamano
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

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

2016-08-26 Thread Junio C Hamano
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

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

2016-08-26 Thread Keller, Jacob E
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

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

2016-08-26 Thread Junio C Hamano
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

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

2016-08-26 Thread Beat Bolli
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

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

2016-08-26 Thread Beat Bolli
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

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

2016-08-26 Thread Junio C Hamano
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

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

2016-08-26 Thread Jeff King
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... > >

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

2016-08-26 Thread Junio C Hamano
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

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

2016-08-26 Thread Junio C Hamano
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,

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

2016-08-26 Thread Stefan Beller
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

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

2016-08-26 Thread Jeff King
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 >

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

2016-08-26 Thread Junio C Hamano
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

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

2016-08-26 Thread Junio C Hamano
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

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

2016-08-26 Thread Junio C Hamano
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

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

2016-08-26 Thread Junio C Hamano
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()

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

2016-08-26 Thread Stefan Beller
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

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

2016-08-26 Thread Junio C Hamano
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

Re: Feature Request: Branch-Aware Submodules

2016-08-26 Thread Hedges Alexander
> 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

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

2016-08-26 Thread Jakub Narębski
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,

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

2016-08-26 Thread Junio C Hamano
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"

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

2016-08-26 Thread Junio C Hamano
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

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

2016-08-26 Thread Keller, Jacob E
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); >

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

2016-08-26 Thread Ralf Thielow
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

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

2016-08-26 Thread Jeff King
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/2] gitattributes: Document the unified "auto" handling

2016-08-26 Thread Junio C Hamano
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 >

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

2016-08-26 Thread Junio C Hamano
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

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

2016-08-26 Thread Junio C Hamano
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

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

2016-08-26 Thread Junio C Hamano
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, >

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

2016-08-26 Thread Philip Oakley
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

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

2016-08-26 Thread Junio C Hamano
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

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

2016-08-26 Thread tboegi
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

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

2016-08-26 Thread tboegi
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:

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

2016-08-26 Thread tboegi
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 ---

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

2016-08-26 Thread Stefan Beller
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

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

2016-08-26 Thread Junio C Hamano
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

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

2016-08-26 Thread Junio C Hamano
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

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

2016-08-26 Thread Junio C Hamano
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

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

2016-08-26 Thread Beat Bolli
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

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

2016-08-26 Thread Stefan Beller
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)) { > +

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

2016-08-26 Thread Ralf Thielow
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

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

2016-08-26 Thread Junio C Hamano
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

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

2016-08-26 Thread Ralf Thielow
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

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

2016-08-26 Thread Stefan Beller
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

[ANNOUNCE] Git v2.10.0-rc2

2016-08-26 Thread Junio C Hamano
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

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

2016-08-26 Thread Junio C Hamano
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

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

2016-08-26 Thread Stefan Beller
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 >

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

2016-08-26 Thread Junio C Hamano
"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 | // > . | | | / > . \ \

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

2016-08-26 Thread 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 args; >> > >

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

2016-08-26 Thread Jacob Keller
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, > >> > > ...) > >> > > { > >> > > +

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

2016-08-26 Thread Stefan Beller
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

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

2016-08-26 Thread Stefan Beller
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

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

2016-08-26 Thread Junio C Hamano
Pranit Bauva writes: > +static int bisect_log(void) > +{ > + struct strbuf buf = STRBUF_INIT; > + > + if (strbuf_read_file(, git_path_bisect_log(), 256) < 0) { > + strbuf_release(); > + return error(_("We are not bisecting.\n")); > + }

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

2016-08-26 Thread Junio C Hamano
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

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

2016-08-26 Thread Christian Couder
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

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

2016-08-26 Thread Jakub Narębski
[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

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

2016-08-26 Thread Eric Wong
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? Graphics setups often require non-Free firmware or drivers for acceptable performance; and there are also

Re: [PATCH v2] for-each-ref: add %(upstream:gone) to mark missing refs

2016-08-26 Thread Karthik Nayak
Hello, >> On Thu, Aug 25, 2016 at 12:03 AM, Jeff King wrote: >>> >>> Ah, right. I was feeling like this was all vaguely familiar. I think >>> it would be better to push forward kn/ref-filter-branch-list. >>> According to the last "what's cooking", I think that topic is waiting >>>

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

2016-08-26 Thread Andrew Ardill
Hi, 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 new release comes

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

2016-08-26 Thread Torsten Bögershausen
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