Re: [PATCHv8 8/8] clone: recursive and reference option triggers submodule alternates

Stefan Beller writes: > On Wed, Aug 17, 2016 at 5:17 PM, Junio C Hamano wrote: >> Stefan Beller writes: >> >>> and now with error handling of invalid options. >> >> Thanks. > > Well this was not the end of the story. I sent that

Possible bug: git pull --rebase discards local commits

I've found a case where git pull --rebase discards commits in my branch if the remote-tracking branch was rewound (and the remote tracking branch's reflog contains my branch's latest commit). This is due to git-pull's usage of git merge-base --fork-point. On one hand, this behaviour might be

Re: [PATCH 1/3] i18n: fix typos for translation

Jean-Noel Avila writes: > Signed-off-by: Jean-Noel Avila > --- > bisect.c| 10 +- > sequencer.c | 2 +- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/bisect.c b/bisect.c > index 6f512c2..b9a0701 100644 > --- a/bisect.c >

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

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 insertions(+), 5 deletions(-) diff --git a/sequencer.c b/sequencer.c index a8c3a48..5f6b020

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

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, 8 insertions(+), 6 deletions(-) diff --git a/sequencer.c b/sequencer.c index 5f6b020..808cd53

Re: [PATCH v8 7/8] cache: add empty_tree_oid object

Jeff King writes: > I suspect we need more than just the "is_empty" query. At least for the > blob case, we do hashcpy() it into a struct (which should eventually > become oidcpy). The empty-tree case even more so, as we pass it to > random functions like lookup_tree(). > > Our

Re: [PATCH] format-patch: show 0/1 and 1/1 for singleton patch with cover letter

Jacob Keller writes: > From: Jacob Keller > > Change the default behavior of git-format-patch to generate numbered > sequence of 0/1 and 1/1 when generating both a cover-letter and a single > patch. This standardizes the cover letter to have 0/N

Re: git-svn bridge and line endings

On Tue, Aug 23, 2016 at 9:43 AM, Torsten Bögershausen wrote: > On Mon, Aug 22, 2016 at 05:04:47PM -0700, Lucian Smith wrote: >> I'm attempting to use the git-svn bridge, and am having problems with >> line endings on Windows. >> >> The setup is that we have a git repository on

Re: git-svn bridge and line endings

On Mon, Aug 22, 2016 at 05:04:47PM -0700, Lucian Smith wrote: > I'm attempting to use the git-svn bridge, and am having problems with > line endings on Windows. > > The setup is that we have a git repository on github, and I've checked > out a branch on my Windows machine using Tortoise svn. I

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

Stefan Beller writes: > On Mon, Aug 22, 2016 at 4:43 PM, Jacob Keller > wrote: >> From: Jacob Keller >> >> A few suggestions from Stefan in regards to falling back to >> .git/modules/ being a bad idea. I've chosen I think

[PATCH 01/15] sequencer: lib'ify write_message()

To be truly useful, the sequencer should never die() but always return an error. Signed-off-by: Johannes Schindelin --- sequencer.c | 19 +++ 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sequencer.c b/sequencer.c index

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

To be truly useful, the sequencer should never die() but always return an error. Signed-off-by: Johannes Schindelin --- sequencer.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sequencer.c b/sequencer.c index 6ac2187..b90294f 100644 ---

Re: [ANNOUNCE] Git v2.10.0-rc1

Johannes Schindelin writes: > On Fri, 19 Aug 2016, Junio C Hamano wrote: > >> [...] >> * A new run-command API function pipe_command() is introduced to > ... > You probably want a '*' in front of this paragraph, too. > >> * Squelch compiler warnings for netmalloc

Re: [git-for-windows] Re: [ANNOUNCE] Git for Windows 2.9.3

Hi Michael, On Tue, 23 Aug 2016, Johannes Schindelin wrote: > On Tue, 23 Aug 2016, Michael J Gruber wrote: > > > Maybe you want to re-read what you wrote to trigger his response, and > > consider adjusting your attitude ("I want this now so I'll release it in > > Git4Win") rather than the

Re: git-svn bridge and line endings

Thanks for the quick responses! My situation is that the git side is entirely whatever github.org is running; presumably the latest stable version? They provide a URL for repositories hosted there that can be accessed by an SVN client--somewhere on github is the 'git-svn bridge' (as I understand

[PATCH 05/15] sequencer: lib'ify read_and_refresh_cache()

To be truly useful, the sequencer should never die() but always return an error. Signed-off-by: Johannes Schindelin --- sequencer.c | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sequencer.c b/sequencer.c index b90294f..a8c3a48

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

To be truly useful, the sequencer should never die() but always return an error. Signed-off-by: Johannes Schindelin --- sequencer.c | 26 ++ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/sequencer.c b/sequencer.c index

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

Signed-off-by: Johannes Schindelin --- sequencer.c | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sequencer.c b/sequencer.c index 324463f..c29de64 100644 --- a/sequencer.c +++ b/sequencer.c @@ -589,12 +589,14 @@ static int

[PATCH 09/15] sequencer: lib'ify create_seq_dir()

To be truly useful, the sequencer should never die() but always return an error. Signed-off-by: Johannes Schindelin --- sequencer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sequencer.c b/sequencer.c index 1bcea84..1706ef4 100644 ---

[PATCH 08/15] sequencer: lib'ify walk_revs_populate_todo()

To be truly useful, the sequencer should never die() but always return an error. Signed-off-by: Johannes Schindelin --- sequencer.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sequencer.c b/sequencer.c index 808cd53..1bcea84 100644

Smart HTTP push permissions failure

Hi Git Community! I'm trying to get Git on the server. I installed Git and httpd on Centos 7 and configred for smart http. I created a project on my local git and I cloned it to a base repository: git clone --bare DataConversion DataConversion.git then I scp it to the server: scp -r

Re: Extending "extended SHA1" syntax to traverse through gitlinks?

Jakub Narębski writes: > Especially that for submodules you need: > > $ git --git-dir=subdir/.git cat-file -p $(git rev-parse HEAD:subdir):file > > (or something like that), assuming that you start in supermodule. > ... > > But perhaps '//' would be better. If the users have

Re: [L10N] Kickoff of translation for Git 2.10.0 round 1

Jean-Noël AVILA writes: >> > 3. git-rebase--interactive, in this_nth_commit_message and >> > skip_nth_commit_message are not localizable, >> >> As the "TRANSLATORS" comment alludes to, "This is the Nth thing" can >> be rephrased to "This is the thing N" or "This is the thing

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

To be truly useful, the sequencer should never die() but always return an error. Signed-off-by: Johannes Schindelin --- sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sequencer.c b/sequencer.c index 0c8c955..6ac2187 100644 ---

[PATCH 13/15] sequencer: lib'ify sequencer_pick_revisions()

To be truly useful, the sequencer should never die() but always return an error. Signed-off-by: Johannes Schindelin --- sequencer.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sequencer.c b/sequencer.c index bac32ea..324463f 100644

[PATCH 00/15] 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 15/15] sequencer: do not die() in fast_forward_to()

A fast-forward may fail e.g. when it would overwrite an untracked file. We still must not exit() in that case: the sequencer is supposedly providing a library function. Signed-off-by: Johannes Schindelin --- sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1

[PATCH 02/15] sequencer: lib'ify do_recursive_merge()

To be truly useful, the sequencer should never die() but always return an error. Signed-off-by: Johannes Schindelin --- sequencer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sequencer.c b/sequencer.c index c75296c..0c8c955 100644 ---

Re: [git-for-windows] Re: [ANNOUNCE] Git for Windows 2.9.3

Hi Michael, On Tue, 23 Aug 2016, Michael J Gruber wrote: > Maybe you want to re-read what you wrote to trigger his response, and > consider adjusting your attitude ("I want this now so I'll release it in > Git4Win") rather than the downstream name. I am working *very* hard on improving the user

[PATCH 11/15] sequencer: lib'ify save_todo()

To be truly useful, the sequencer should never die() but always return an error. Signed-off-by: Johannes Schindelin --- sequencer.c | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sequencer.c b/sequencer.c index

[PATCH 10/15] sequencer: lib'ify save_head()

To be truly useful, the sequencer should never die() but always return an error. Signed-off-by: Johannes Schindelin --- sequencer.c | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sequencer.c b/sequencer.c index 1706ef4..3e07aa0

Re: git-config(1) should mention `git -c`

Jeff King writes: > That seems like the most sensible place, as that is where we should > cover the order of reading and precedence. Perhaps FILES should be > renamed to SOURCES or something (though I do not recall if we are > restricted to "usual" manpage section names or not). >

Re: git-svn bridge and line endings

Lucian Smith writes: > The setup is that we have a git repository on github, and I've checked > out a branch on my Windows machine using Tortoise svn. I make > changes, commit them, and the branch is updated. In general, this > works fine. Hmph, doesn't Windows port

Re: [PATCH v2 7/7] blame: actually use the diff opts parsed from the command line

Michael Haggerty writes: > Somebody who knows more about how diff operations are configured > should please review this. I'm not certain that the change as > implemented won't have other unwanted side-effects, though of course > I checked that the test suite runs correctly.

Re: Bug with git worktrees and git init

Max Nordlund venit, vidit, dixit 23.08.2016 14:35: > Hi, > > I've been using multiple worktrees for months without issue (it's a > great feature, thanks), until recently when I wanted to add hooks to > them. So, when I added a template for the hooks, everything was fine > until I did a git reset

Re: git-svn bridge and line endings

Windows doesn't have any problem reading files with any form of crlf. The main issue we have run into thus far is that if I create a new file in Windows, it's going to have crlf, and if I check it in that way through this svn process, the file is then stored with crlfs, which git does not expect.

Re: [L10N] Kickoff of translation for Git 2.10.0 round 1

On mardi 23 août 2016 08:58:55 CEST Junio C Hamano wrote: > > Let's cut it like this : first ten are literally translated, the following > > ones fall back to a general rule. > > I actually once wrote "It is rare to squash dozens of commits into > one, so the first ten or dozen messages that

Re: [git-for-windows] Re: [ANNOUNCE] Git for Windows 2.9.3

Johannes Schindelin writes: > In case it is not crystal-clear, let me clarify one very important point. > It seems that some people mistake the work I do for something I do on a > whim. This is not so. > > The patch series that triggered this entire unfortunate

Re: git-svn bridge and line endings

On 23.08.16 19:50, Lucian Smith wrote: > On Tue, Aug 23, 2016 at 10:36 AM, Julian Phillips > wrote: >> On 23/08/2016 17:14, Lucian Smith wrote: >>> >>> Thanks for the quick responses! >>> >>> My situation is that the git side is entirely whatever github.org is >>>

Re: Most recent revision that contains a string

Nikolaus Rath writes: >> Btw, please don't set these headers on kernel.org lists: >> >> Mail-Copies-To: never >> Mail-Followup-To: git@vger.kernel.org >> >> Like any mail server, vger fails from time-to-time and >> reply-to-all prevents it from being a single point

Re: [PATCH] doc: mention `git -c` in git-config(1)

David Glasser writes: > Signed-off-by: David Glasser > --- > Documentation/git-config.txt | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt > index f163113..83f86b9 100644

Re: [PATCH 1/2] help: introduce option --command-only

2016-08-19 10:39 GMT+02:00 Remi Galan Alfonso : > Hi Ralf, > > Ralf Thielow writes: >> [...] >> +test_expect_success "works for commands and guides by default" " >> +git help status && >> +git help revisions >> +"

Re: git-svn bridge and line endings

On Tue, Aug 23, 2016 at 10:36 AM, Julian Phillips wrote: > On 23/08/2016 17:14, Lucian Smith wrote: >> >> Thanks for the quick responses! >> >> My situation is that the git side is entirely whatever github.org is >> running; presumably the latest stable version? They

Re: Possible bug: git pull --rebase discards local commits

Joshua Phillips writes: > I've found a case where git pull --rebase discards commits in my branch > if the remote-tracking branch was rewound (and the remote tracking > branch's reflog contains my branch's latest commit). This is due to > git-pull's usage of git merge-base

Re: [PATCH v10 1/9] Git 2.10-rc1

On Mon, Aug 22, 2016 at 5:28 PM, Stefan Beller wrote: > On Mon, Aug 22, 2016 at 4:43 PM, Jacob Keller > wrote: > > Bad rebase? Ya not sure what happened here. Will find out tomorrow. Thanks, Jake -- To unsubscribe from this list: send the line

Re: Extending "extended SHA1" syntax to traverse through gitlinks?

W dniu 23.08.2016 o 08:53, Josh Triplett pisze: > On Mon, Aug 22, 2016 at 08:39:19PM +0200, Jakub Narębski wrote: >> W dniu 21.08.2016 o 16:26, Josh Triplett pisze: >>> On Sun, Aug 21, 2016 at 03:46:36PM +0200, Jakub Narębski wrote: W dniu 21.08.2016 o 00:50, Josh Triplett pisze: > [...]

Re: Getting "The following submodule paths contain changes that can not be found on any remote" when they are in the remote

On Tue, Aug 23, 2016 at 11:34 AM, Leandro Lucarella wrote: > Hi, I'm getting very often, but not always, with many different > projects using submodules, the message: > > The following submodule paths contain changes that can > not be found on any remote: >

Re: [PATCH v2 5/7] xdl_change_compact(): introduce the concept of a change group

Michael Haggerty writes: > The idea of xdl_change_compact() is fairly simple: > > * Proceed through groups of changed lines in the file to be compacted, > keeping track of the corresponding location in the "other" file. > > * If possible, slide the group up and down to

Re: [PATCH] format-patch: show 0/1 and 1/1 for singleton patch with cover letter

Junio C Hamano writes: > This obviously changes the behaviour, but I do not think of a reason > why this change is a bad idea. >> diff --git a/builtin/log.c b/builtin/log.c >> index 92dc34dcb0cc..8e6100fb0c5b 100644 >> --- a/builtin/log.c >> +++ b/builtin/log.c >> @@

Re: [PATCH v14 01/27] bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

Hey everyone, Sending a "cover letter" to this series. Changes with wrt v12[1] are: * Rebased on v2.10-rc0 * Two function signatures had changed while the topic develop so changed those. * Correct the "mark for translation" messages properly as I had previously used N_() in some

Getting "The following submodule paths contain changes that can not be found on any remote" when they are in the remote

Hi, I'm getting very often, but not always, with many different projects using submodules, the message: The following submodule paths contain changes that can not be found on any remote: Please try git push --recurse-submodules=on-demand or cd to the path and use

Re: [PATCH] format-patch: show 0/1 and 1/1 for singleton patch with cover letter

On Tue, Aug 23, 2016 at 9:33 AM, Junio C Hamano wrote: > Jacob Keller writes: > >> From: Jacob Keller >> >> Change the default behavior of git-format-patch to generate numbered >> sequence of 0/1 and 1/1 when generating both a

Re: [PATCH] format-patch: show 0/1 and 1/1 for singleton patch with cover letter

On Tue, Aug 23, 2016 at 2:21 PM, Junio C Hamano wrote: > Junio C Hamano writes: >>> total = nr; >>> -if (!keep_subject && auto_number && total > 1) >>> +if (!keep_subject && auto_number && (total > 1 || cover_letter)) >>> numbered =

Re: [PATCH v14 01/27] bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

Pranit Bauva writes: > `--next-all` is meant to be used as a subcommand to support multiple > "operation mode" though the current implementation does not contain any > other subcommand along side with `--next-all` but further commits will > include some more subcommands.

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

The surrounding advice is printed to stderr, but the list of submodules is not. Make the report consistent by reporting everything to stderr. Signed-off-by: Stefan Beller --- This fixes one of the bugs mentioned in

Re: [PATCH v14 01/27] bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

Hey Junio, On Wed, Aug 24, 2016 at 1:58 AM, Junio C Hamano wrote: > Pranit Bauva writes: > >> `--next-all` is meant to be used as a subcommand to support multiple >> "operation mode" though the current implementation does not contain any >> other

Re: [PATCHv5 1/8] t7408: modernize style

On Mon, Aug 15, 2016 at 2:53 PM, Stefan Beller wrote: > No functional change intended. This commit only changes formatting > to the style we recently use, e.g. starting the body of a test with a > single quote on the same line as the header, and then having the test > indented

Re: [PATCH 5/7] delta_base_cache: drop special treatment of blobs

Jeff King writes: > Let's run the same numbers without caring about object type > at all (i.e., one LRU list, and always evicting whatever is > at the head, regardless of type). > ... > So it seems like a clear winner, and that's what this patch > implements. > > Signed-off-by:

Re: [PATCHv5 2/8] t7408: merge short tests, factor out testing method

On Mon, Aug 15, 2016 at 2:53 PM, Stefan Beller wrote: > Tests consisting of one line each can be consolidated to have fewer tests > to run as well as fewer lines of code. > > When having just a few git commands, do not create a new shell but > use the -C flag in Git to execute

Re: [git-for-windows] Re: [ANNOUNCE] Git for Windows 2.9.3

Junio C Hamano writes: > One way to avoid that risk may be to release the new feature as > "experimental-and-subject-to-change", so that interested users on > Windows can actually try it out to see if the feature itself > (whatever its interface to them is) makes sense, and

Re: git-config(1) should mention `git -c`

On Tue, Aug 23, 2016 at 10:16:18AM -0700, Junio C Hamano wrote: > Jeff King writes: > > > That seems like the most sensible place, as that is where we should > > cover the order of reading and precedence. Perhaps FILES should be > > renamed to SOURCES or something (though I do

Re: [PATCH 3/7] release_delta_base_cache: reuse existing detach function

Jeff King writes: > This function drops an entry entirely from the cache, > meaning that aside from the freeing of the buffer, it is > exactly equivalent to detach_delta_base_cache_entry(). Let's > build on top of the detach function, which shortens the code > and will make it

Re: [PATCH 6/7] delta_base_cache: use hashmap.h

Jeff King writes: > So while the value for that case _isn't_ as good as the > optimal one measured above (which was 2048 entries), given > the bouncing I'm hesitant to suggest that 2048 is any kind > of optimum (not even for linux.git, let alone as a general > rule). The generic

[PATCH v2] format-patch: show 0/1 and 1/1 for singleton patch with cover letter

From: Jacob Keller Change the default behavior of git-format-patch to generate numbered sequence of 0/1 and 1/1 when generating both a cover-letter and a single patch. This standardizes the cover letter to have 0/N which helps distinguish the cover letter from the patch

Re: [PATCHv5 3/8] submodule--helper module-clone: allow multiple references

On Mon, Aug 15, 2016 at 2:53 PM, Stefan Beller wrote: > Allow users to pass in multiple references, just as clone accepts multiple > references as well. > Straight forward and reasonable change. Regards, Jake -- To unsubscribe from this list: send the line "unsubscribe git"

Re: [PATCHv5 5/8] clone: factor out checking for an alternate path

On Mon, Aug 15, 2016 at 2:53 PM, Stefan Beller wrote: > + if (!repo && is_directory(mkpath("%s/.git/objects", ref_git))) { > + char *ref_git_git = mkpathdup("%s/.git", ref_git); > + free(ref_git); > + ref_git = ref_git_git; > +

Re: [PATCHv5 4/8] submodule--helper update-clone: allow multiple references

On Mon, Aug 15, 2016 at 2:53 PM, Stefan Beller wrote: > Allow the user to pass in multiple references to update_clone. > Currently this is only internal API, but once the shell script is > replaced by a C version, this is needed. > > This fixes an API bug between the shell

Re: [PATCH v2] format-patch: show 0/1 and 1/1 for singleton patch with cover letter

Jacob Keller writes: > diff --git a/builtin/log.c b/builtin/log.c > index 92dc34dcb0cc..49aa534f4a01 100644 > --- a/builtin/log.c > +++ b/builtin/log.c > @@ -1676,16 +1676,16 @@ int cmd_format_patch(int argc, const char **argv, > const char *prefix) > /*

Re: [PATCHv5 7/8] clone: implement optional references

On Mon, Aug 15, 2016 at 2:53 PM, Stefan Beller wrote: > In a later patch we want to try to create alternates for submodules, > but they might not exist in the referenced superproject. So add a way > to skip the non existing references and report them. > Seems pretty straight

Re: [PATCHv5 6/8] clone: clarify option_reference as required

On Mon, Aug 15, 2016 at 2:53 PM, Stefan Beller wrote: > In the next patch we introduce optional references; To better distinguish > between optional and required references we rename the variable. > Makes sense. It's a bit weird to process "option_required_reference" but I

Re: [PATCH v2] format-patch: show 0/1 and 1/1 for singleton patch with cover letter

On Tue, Aug 23, 2016 at 3:34 PM, Junio C Hamano wrote: > Jacob Keller writes: > >> diff --git a/builtin/log.c b/builtin/log.c >> index 92dc34dcb0cc..49aa534f4a01 100644 >> --- a/builtin/log.c >> +++ b/builtin/log.c >> @@ -1676,16 +1676,16 @@ int

[PATCH v3] format-patch: show 0/1 and 1/1 for singleton patch with cover letter

From: Jacob Keller Change the default behavior of git-format-patch to generate numbered sequence of 0/1 and 1/1 when generating both a cover-letter and a single patch. This standardizes the cover letter to have 0/N which helps distinguish the cover letter from the patch

Re: [PATCHv5 8/8] clone: recursive and reference option triggers submodule alternates

>> + >> + if (option_recursive) { >> + if (option_required_reference.nr && >> + option_optional_reference.nr) >> + die(_("clone --recursive is not compatible with " >> + "both --reference and

Re: [PATCH v10 8/9] submodule: refactor show_submodule_summary with helper function

Jacob Keller writes: > From: Jacob Keller > > A future patch is going to add a new submodule diff format which > displays an inline diff of the submodule changes. To make this easier, > and to ensure that both submodule diff formats use the same

Re: Getting "The following submodule paths contain changes that can not be found on any remote" when they are in the remote

On Tue, 23 Aug 2016 20:34:46 +0200 Leandro Lucarella wrote: > This even happens after doing a: > > git submodule deinit > rm -fr > rm -fr .git/modules/ > git submodule update --init One more thing, doing a clean new clone seems to work, but I have this issue

Re: [PATCH 1/7] cache_or_unpack_entry: drop keep_cache parameter

Jeff King writes: > There is only one caller of cache_or_unpack_entry() and it > always passes 1 for the keep_cache parameter. We can > simplify it by dropping the "!keep_cache" case. > > Another call, which did pass 0, was dropped in abe601b > (sha1_file: remove recursion in

Re: [PATCH 2/7] clear_delta_base_cache_entry: use a more descriptive name

Jeff King writes: > The delta base cache entries are stored in a fixed-length > hash table. So the way to remove an entry is to "clear" the > slot in the table, and that is what this function does. > > However, the name is a leaky abstraction. If we were to > change the hash table

[BUG] gitk tree view: lines messed up

Hi, I'm having problems with gitk not displaying the history tree correctly. The lines representing branches are messed up, circles for the individual commits are missing (screenshot attached). I tried to delete ~/.config/git/gitk, even tried a completely fresh user account without success.

Re: [PATCHv5 8/8] clone: recursive and reference option triggers submodule alternates

On Mon, Aug 15, 2016 at 2:53 PM, Stefan Beller wrote: > When `--recursive` and `--reference` is given, it is reasonable to > expect that the submodules are created with references to the submodules > of the given alternate for the superproject. > > An initial attempt to do

Re: [git-for-windows] Re: [ANNOUNCE] Git for Windows 2.9.3

Johannes Schindelin venit, vidit, dixit 23.08.2016 15:54: > Hi Duy, > > On Mon, 22 Aug 2016, Duy Nguyen wrote: > >> On Thu, Aug 18, 2016 at 3:37 PM, Johannes Schindelin >> wrote: >>> Hi Junio, >>> >>> On Wed, 17 Aug 2016, Junio C Hamano wrote: >>> Johannes

Re: [git-for-windows] Re: [ANNOUNCE] Git for Windows 2.9.3

Johannes Schindelin writes: > The feature in question is also highly unlikely to be used as much by > non-Windows users as by Windows users due to the unfortunate choice of the > default setting for core.autocrlf. My vague recollection from some years ago was that

Re: Getting "The following submodule paths contain changes that can not be found on any remote" when they are in the remote

On Tue, Aug 23, 2016 at 11:38 AM, Leandro Lucarella wrote: > On Tue, 23 Aug 2016 20:34:46 +0200 > Leandro Lucarella wrote: >> This even happens after doing a: >> >> git submodule deinit >> rm -fr >> rm -fr .git/modules/ >>

Re: [git-for-windows] Re: [ANNOUNCE] Git for Windows 2.9.3

On Tue, Aug 23, 2016 at 5:42 PM, Junio C Hamano wrote: > > Junio C Hamano writes: > > > One way to avoid that risk may be to release the new feature as > > "experimental-and-subject-to-change", so that interested users on > > Windows can actually try it out

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

Sorry for being late in responding. It's been busy days. 2016-08-18 21:51 GMT+02:00 Junio C Hamano : > Ralf Thielow writes: > > The same comment applies to 1/2, too, in that the word "command" > will be interpreted differently by different people. For

[PATCH] doc: mention `git -c` in git-config(1)

Signed-off-by: David Glasser --- Documentation/git-config.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index f163113..83f86b9 100644 --- a/Documentation/git-config.txt +++

Re: git-config(1) should mention `git -c`

On Tue, Aug 23, 2016 at 10:16 AM, Junio C Hamano wrote: > Jeff King writes: > >> That seems like the most sensible place, as that is where we should >> cover the order of reading and precedence. Perhaps FILES should be >> renamed to SOURCES or something (though

Re: git-svn bridge and line endings

On 23/08/2016 17:14, Lucian Smith wrote: Thanks for the quick responses! My situation is that the git side is entirely whatever github.org is running; presumably the latest stable version? They provide a URL for repositories hosted there that can be accessed by an SVN client--somewhere on

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

On Tue, Aug 23, 2016 at 10:25 AM, Junio C Hamano wrote: > I am not so sure about that. If there is an existing place that is > buggy, shouldn't we fix that, instead of spreading the same bug > (assuming that it is a bug in the first place, which I do not have a > strong

Re: [PATCH 1/2] help: introduce option --command-only

2016-08-19 10:32 GMT+02:00 Johannes Schindelin : > So how about fixing that? I would suggest to do it this way: > > - configure help.format = html (for "man", the current code would always > add $(prefix)/share/man to the MANPATH when testing, not what we want, >

Re: [PATCH v3] format-patch: show 0/1 and 1/1 for singleton patch with cover letter

Jacob Keller writes: > From: Jacob Keller > > Change the default behavior of git-format-patch to generate numbered > sequence of 0/1 and 1/1 when generating both a cover-letter and a single > patch. This standardizes the cover letter to have 0/N

Re: Extending "extended SHA1" syntax to traverse through gitlinks?

Jakub Narębski writes: > The point is that submodule has it's own object database. It might > be the same as superproject's, but you need to handle submodule objects > being in separate submodule repository anyway. Common repository is > just a special case. > > By the way,

Re: [PATCH v2 7/7] blame: actually use the diff opts parsed from the command line

Am 22.08.2016 um 13:22 schrieb Michael Haggerty: "git blame" already parsed generic diff options from the command line via diff_opt_parse(), but instead of passing the resulting xdl_opts to xdi_diff(), it sent its own xdl_opts, which only reflected the values of the self-parsed options "-w" and

Re: Extending "extended SHA1" syntax to traverse through gitlinks?

On Mon, Aug 22, 2016 at 08:39:19PM +0200, Jakub Narębski wrote: > W dniu 21.08.2016 o 16:26, Josh Triplett pisze: > > On Sun, Aug 21, 2016 at 03:46:36PM +0200, Jakub Narębski wrote: > >> W dniu 21.08.2016 o 00:50, Josh Triplett pisze: > >>> Currently, if you have a branch "somebranch" that

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

On Mon, Aug 22, 2016 at 6:00 PM, Stefan Beller wrote: > On Mon, Aug 22, 2016 at 4:43 PM, Jacob Keller > wrote: >> From: Jacob Keller >> >> A few suggestions from Stefan in regards to falling back to >> .git/modules/ being a

[PATCH v14 02/27] bisect: rewrite `check_term_format` shell function in C

Reimplement the `check_term_format` shell function in C and add a `--check-term-format` subcommand to `git bisect--helper` to call it from git-bisect.sh Using `--check-term-format` subcommand is a temporary measure to port shell function to C so as to use the existing test suite. As more

Bug with git worktrees and git init

Hi, I've been using multiple worktrees for months without issue (it's a great feature, thanks), until recently when I wanted to add hooks to them. So, when I added a template for the hooks, everything was fine until I did a git reset --hard in the original repo which both applied those changes to

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

Reimplement the `bisect_replay` shell function in C and also add `--bisect-replay` subcommand to `git bisect--helper` to call it from git-bisect.sh Using `--bisect-replay` subcommand is a temporary measure to port shell function to C so as to use the existing test suite. As more functions are

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

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. Mentored-by: Lars Schneider Mentored-by: Christian Couder Signed-off-by: Pranit Bauva

[PATCH v14 23/27] bisect--helper: retire `--bisect-write` subcommand

The `--bisect-write` subcommand is no longer used in the shell script and the function `bisect_write()` is called from the C implementation. Mentored-by: Lars Schneider Mentored-by: Christian Couder Signed-off-by: Pranit Bauva

[PATCH v14 09/27] bisect--helper: `bisect_write` shell function in C

Reimplement the `bisect_write` shell function in C and add a `bisect-write` subcommand to `git bisect--helper` to call it from git-bisect.sh Using `--bisect-write` subcommand is a temporary measure to port shell function in C so as to use the existing test suite. As more functions are ported,

  1   2   >