Re: [PATCH 4/4] config: don't implicitly use gitdir

On Mon, Jun 12, 2017 at 11:16:27PM -0700, Brandon Williams wrote: > > If the parameter is now required, then it might make sense for it to > > become an actual function parameter instead of being stuffed into the > > config_options struct. That would give you your breaking change, plus > > make it

Re: Feature Request: Show status of the stash in git status command

On Mon, Jun 12, 2017 at 11:42:44PM -0400, liam Beguin wrote: [...] >> Conceptually, the contents of the stash are *not* commits, even >> though the implementation happens to use a commit to represent each >> stash entry. Perhaps "has %d entry/entries" is an improvement, but >> a quick scanning of

Re: [PATCH 4/4] config: don't implicitly use gitdir

On Mon, Jun 12, 2017 at 10:52:43PM -0700, Brandon Williams wrote: > > >> curious: Why get_git_common_dir() instead of get_git_dir()? > > > > > > Needs to be commondir since the config is stored in the common git > > > directory and not a per worktree git directory. > > > > *puzzled* Why wasn't th

Re: [PATCH] strbuf: let strbuf_addftime handle %z and %Z itself

On Mon, Jun 12, 2017 at 2:10 PM, Jeff King wrote: > > I suspect nobody has complained because we generally encourage real > "-0800" names when specifying zones. That's what any sane person uses, and it's what SMTP requiries. The timezone names are a (bad) joke. If a human can't understand them (

Re: [PATCH 4/4] config: don't implicitly use gitdir

On 06/12, Jeff King wrote: > On Mon, Jun 12, 2017 at 06:38:17PM -0700, Jonathan Nieder wrote: > > > Brandon Williams wrote: > > > On 06/12, Jonathan Nieder wrote: > > > > >> Alternatively, could this patch rename git_config_with_options? That > > >> way any other patch in flight that calls git_c

Re: [PATCH 4/4] config: don't implicitly use gitdir

On 06/12, Jonathan Nieder wrote: > Hi again, > > Brandon Williams wrote: > > On 06/12, Jonathan Nieder wrote: > > >> Alternatively, could this patch rename git_config_with_options? That > >> way any other patch in flight that calls git_config_with_options would > >> conflict with this patch, giv

Re: [PATCH v2] doc: fix location of index in worktree scenatio

On 06/12/2017 06:06 PM, Junio C Hamano wrote: Torsten Bögershausen writes: Thanks for working on this (and keeping me in cc) The commit head line does not fully match my expactions: "doc: fix location of index in worktree scenatio" "doc:" is OK, but is the "location of index" fixed ? Actually

Re: [PATCH] send-email: Add tocmd option to suppress-cc

On 12-06-17, 11:04, Junio C Hamano wrote: > Junio C Hamano writes: > > > Viresh Kumar writes: > > > >> On 18-05-17, 17:05, Viresh Kumar wrote: > >>> This adds tocmd option to suppress-cc command which already supports > >>> cccmd and others. > >>> > >>> Signed-off-by: Viresh Kumar > >>> --- >

Re: Feature Request: Show status of the stash in git status command

Hi, Thanks for the feedback. I'll be sending a patch with the updates shortly! On 12/06/17 11:35 AM, Junio C Hamano wrote: > liam Beguin writes: > >> +static int stash_count_refs(struct object_id *ooid, struct object_id *noid, >> +const char *email, timestamp_t timestam

Re: [PATCH 4/4] config: don't implicitly use gitdir

On Mon, Jun 12, 2017 at 06:38:17PM -0700, Jonathan Nieder wrote: > Brandon Williams wrote: > > On 06/12, Jonathan Nieder wrote: > > >> Alternatively, could this patch rename git_config_with_options? That > >> way any other patch in flight that calls git_config_with_options would > >> conflict wi

[RFC/PATCH] builtin/blame: darken redundant line information

When using git-blame lots of lines contain redundant information, for example in hunks that consist of multiple lines, the metadata (commit name, author, timezone) are repeated. A reader may not be interested in those, so darken them. The darkening is not just based on hunk, but actually takes the

Re: [PATCH 0/3] update sha1dc

* ?var Arnfj?r? Bjarmason [170606 11:12]: > This updates sha1dc fixing the issue on Cygwin introduced in 2.13.1, > and hopefully not regressing elsewhere. Liam, it would be much > appreciated if you could test this on SPARC. Tested and confirmed this works for SPARC with no build flags. Sorry fo

Re: [PATCH 4/4] config: don't implicitly use gitdir

Hi again, Brandon Williams wrote: > On 06/12, Jonathan Nieder wrote: >> Alternatively, could this patch rename git_config_with_options? That >> way any other patch in flight that calls git_config_with_options would >> conflict with this patch, giving us an opportunity to make sure it >> also set

Re: [PATCH 4/4] config: don't implicitly use gitdir

Brandon Williams wrote: > On 06/12, Jonathan Nieder wrote: >> Brandon Williams wrote: >>> Commit 2185fde56 (config: handle conditional include when $GIT_DIR is >>> not set up) added a 'git_dir' field to the config_options struct. Let's >>> use this option field explicitly all the time instead of

Re: [PATCH 4/4] config: don't implicitly use gitdir

On 06/12, Jonathan Nieder wrote: > Hi, > > Brandon Williams wrote: > > > Commit 2185fde56 (config: handle conditional include when $GIT_DIR is > > not set up) added a 'git_dir' field to the config_options struct. Let's > > use this option field explicitly all the time instead of occasionally > >

Re: [PATCH 0/4] config.h

Brandon Williams wrote: > Brandon Williams (4): > config: create config.h > config: remove git_config_iter > config: don't include config.h by default > config: don't implicitly use gitdir Patches 1-3 are Reviewed-by: Jonathan Nieder I'm very happy to see cache.h getting shorter and le

Re: [PATCH 4/4] config: don't implicitly use gitdir

Hi, Brandon Williams wrote: > Commit 2185fde56 (config: handle conditional include when $GIT_DIR is > not set up) added a 'git_dir' field to the config_options struct. Let's > use this option field explicitly all the time instead of occasionally > falling back to calling 'git_pathdup("config")'

Re: [PATCH 2/4] config: remove git_config_iter

On Mon, Jun 12, 2017 at 05:49:11PM -0700, Jonathan Nieder wrote: > > Since there is no implementation of the function 'git_config_iter' lets > > stop exporting it and remove the prototype from config.h. > > > > Signed-off-by: Brandon Williams > > --- > > config.h | 1 - > > 1 file changed, 1 del

Re: [PATCHv2 1/5] revision.h: turn rev_info.early_output back into an unsigned int

On Mon, Jun 12, 2017 at 05:59:02PM -0400, Jeff King wrote: > The nice thing about deprecating it is that I think callers need to be > prepared to handle the case already that it does nothing. So if we just > ripped out the code and treated it as a silent noop, everything would > just work. Actual

Re: [PATCH 2/4] config: remove git_config_iter

(+tanayabh) Hi, Brandon Williams wrote: > Since there is no implementation of the function 'git_config_iter' lets > stop exporting it and remove the prototype from config.h. > > Signed-off-by: Brandon Williams > --- > config.h | 1 - > 1 file changed, 1 deletion(-) Good eyes. Looks like the f

proposal for how to share other refs as part of refs/tracking/*

Hi, There's no actual code yet, (forgive me), but I've been thinking back to a while ago about attempting to find a way to share things like refs/notes, and similar refs which are usually not shared across a remote. By default, those refs are not propagated when you do a push or a pull, and this

Re: [BUG] add_again() off-by-one error in custom format

Michael Giuffrida writes: > For the abbreviated commit hash placeholder ('h'), pretty.c uses > add_again() to cache the result of the expansion, and then uses that > result in future expansions. This causes problems when the expansion > includes whitespace: > > $ git log -n 1 --pretty='format

Re: [PATCH] strbuf: let strbuf_addftime handle %z and %Z itself

Am 12.06.2017 um 21:02 schrieb Ævar Arnfjörð Bjarmason: I only ever use the time offset info to quickly make a mental note of "oh +0200, this guy's in Europe", or "oh -0400 America East". Having any info at all for %Z would allow me to easily replace that already buggy mapping that exists in my h

[PATCH 06/17] tree: convert read_tree to take an index parameter

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 2 +- tree.c | 28 ++-- tree.h | 3 ++- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 0044abf66..93e46ab5f 100644 --- a/built

[PATCH 11/17] ls-files: convert show_ru_info to take an index

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 5dbff9496..375fe09d1 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -292,14 +292,14 @@ static void show_ce_

[PATCH 08/17] ls-files: convert write_eolinfo to take an index

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index a78b291ab..8c3f3d8ca 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -53,17 +53,16 @@ static const cha

[PATCH 05/17] convert: convert renormalize_buffer to take an index

Signed-off-by: Brandon Williams --- convert.c | 6 -- convert.h | 3 ++- ll-merge.c| 2 +- merge-recursive.c | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/convert.c b/convert.c index 600d11e73..4097f521f 100644 --- a/convert.c +++ b/convert.c

[PATCH 10/17] ls-files: convert show_other_files to take an index

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index b82b78036..5dbff9496 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -108,13 +108,14 @@ static void show_dir_

[PATCH 09/17] ls-files: convert show_killed_files to take an index

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 8c3f3d8ca..b82b78036 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -120,7 +120,8 @@ static

[PATCH 15/17] ls-files: convert show_files to take an index

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 927aa6746..55d6f54fd 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -329,7 +329,7

[PATCH 17/17] ls-files: factor out tag calculation

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 41 + 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index c9307f9ef..cdc1cfdd2 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -93

[PATCH 12/17] ls-files: convert ce_excluded to take an index

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 375fe09d1..762257f39 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -321,10 +321,11 @@ static void show_ru

[PATCH 16/17] ls-files: factor out debug info into a function

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 23 ++- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 55d6f54fd..c9307f9ef 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -93,6 +93,19 @@ static

[PATCH 14/17] ls-files: convert show_ce_entry to take an index

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index b1626b13b..927aa6746 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -232,7 +232,8 @@ static void show_g

[PATCH 13/17] ls-files: convert prune_cache to take an index

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 762257f39..b1626b13b 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -380,30 +380,31 @@ static void

[PATCH 01/17] convert: convert get_cached_convert_stats_ascii to take an index

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 3 ++- convert.c | 5 +++-- convert.h | 5 - 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index b376afc31..0044abf66 100644 --- a/builtin/ls-files.c +++ b/built

[PATCH 04/17] convert: convert convert_to_git to take an index

Signed-off-by: Brandon Williams --- apply.c| 2 +- blame.c| 2 +- combine-diff.c | 2 +- convert.c | 7 --- convert.h | 8 +--- diff.c | 6 +++--- dir.c | 2 +- sha1_file.c| 4 ++-- 8 files changed, 18 insertions(+), 15 deletions(-) diff --g

[PATCH 07/17] ls-files: convert overlay_tree_on_cache to take an index

Signed-off-by: Brandon Williams --- builtin/commit.c | 3 ++- builtin/ls-files.c | 15 --- cache.h| 3 ++- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index da1ba4c86..78ef319a2 100644 --- a/builtin/commit.c +++ b

[PATCH 03/17] convert: convert convert_to_git_filter_fd to take an index

Signed-off-by: Brandon Williams --- convert.c | 5 +++-- convert.h | 3 ++- sha1_file.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/convert.c b/convert.c index 0cafb06f5..c09242cec 100644 --- a/convert.c +++ b/convert.c @@ -1108,7 +1108,8 @@ int convert_to_git(const

[PATCH 02/17] convert: convert crlf_to_git to take an index

Signed-off-by: Brandon Williams --- convert.c | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/convert.c b/convert.c index 03160b376..0cafb06f5 100644 --- a/convert.c +++ b/convert.c @@ -218,13 +218,13 @@ static void check_safe_crlf(const char *path, enum crlf_a

[PATCH 00/17] convert ls-files internals to pass around an index

This is the second chunk of patches I want to carve off of my 'repository object' series. As you can see its 17 patches long so by eliminating this the repository series shrinks by a considerable amount. The point of this series is to stop having some of the internals of ls-files (and subsequent

[GSoC] Update: Week 4

SUMMARY OF MY PROJECT: Git submodule subcommands are currently implemented by using shell script 'git-submodule.sh'. There are several reasons why we'll prefer not to use the shell script. My project intends to convert the subcommands into C code, thus making them builtins. This will increase Git'

Re: [PATCH 0/4] config.h

On 06/12, Jeff King wrote: > On Mon, Jun 12, 2017 at 02:53:52PM -0700, Brandon Williams wrote: > > > > These all seem reasonable to me. Patch 3 made me shrug a little, because > > > it seems like the majority of C files end up including it anyway. I > > > suspect you could break config.h down into

Re: [PATCH v5 7/7] fsmonitor: add a performance test

Ben Peart writes: > diff --git a/t/helper/test-drop-caches.c b/t/helper/test-drop-caches.c > new file mode 100644 > index 00..80830d920b > --- /dev/null > +++ b/t/helper/test-drop-caches.c > @@ -0,0 +1,107 @@ > +#include "git-compat-util.h" > +#include I thought compat-util should alrea

Re: [PATCH 0/4] config.h

On Mon, Jun 12, 2017 at 02:53:52PM -0700, Brandon Williams wrote: > > These all seem reasonable to me. Patch 3 made me shrug a little, because > > it seems like the majority of C files end up including it anyway. I > > suspect you could break config.h down into two files: the few things > > that e

Re: [PATCHv2 1/5] revision.h: turn rev_info.early_output back into an unsigned int

On Mon, Jun 12, 2017 at 01:36:08PM -0700, Junio C Hamano wrote: > > I'm not sure if I was just being thick or if that point (and the fact > > that --early-output has basically been a noop since 2011!) should be > > made more explicit. > > > > Given that nobody noticed, I kind of wonder if we shoul

Re: [PATCH 0/4] config.h

On 06/12, Jeff King wrote: > On Mon, Jun 12, 2017 at 02:34:02PM -0700, Brandon Williams wrote: > > > After some discussion I realized that my 'repository object' series was > > getting > > to be rather long and increase in scope. So I've decided to break off these > > couple patches into their o

Re: [PATCH 0/4] config.h

On Mon, Jun 12, 2017 at 02:34:02PM -0700, Brandon Williams wrote: > After some discussion I realized that my 'repository object' series was > getting > to be rather long and increase in scope. So I've decided to break off these > couple patches into their own series so they can be reviewed more

Re: [PATCH] wt-status.c: Modified status message shown for a parent-less branch

On Mon, Jun 12, 2017 at 02:31:25PM -0700, Junio C Hamano wrote: > >> - status_printf_ln(s, c, _("Changes not staged for commit:")); > >> + if (s->commit_template) > >> + status_printf_ln(s, c, _("Changes not staged for commit:")); > >> + else > >> + status_printf_ln(s, c, _("C

[PATCH 4/4] config: don't implicitly use gitdir

Commit 2185fde56 (config: handle conditional include when $GIT_DIR is not set up) added a 'git_dir' field to the config_options struct. Let's use this option field explicitly all the time instead of occasionally falling back to calling 'git_pathdup("config")' to get the path to the local repositor

[PATCH 3/4] config: don't include config.h by default

Stop including config.h by default in cache.h. Instead only include config.h in those files which require use of the config system. Signed-off-by: Brandon Williams --- advice.c | 1 + alias.c | 1 + apply.c | 1 + archive

[PATCH 2/4] config: remove git_config_iter

Since there is no implementation of the function 'git_config_iter' lets stop exporting it and remove the prototype from config.h. Signed-off-by: Brandon Williams --- config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/config.h b/config.h index f7f8b66c5..c70599bd5 100644 --- a/config.h +

[PATCH 1/4] config: create config.h

Move all config related declarations from cache.h to a new config.h header file. This makes cache.h smaller and allows for the opportunity in a following patch to only include config.h when needed. Signed-off-by: Brandon Williams --- cache.h | 190 +-

[PATCH 0/4] config.h

After some discussion I realized that my 'repository object' series was getting to be rather long and increase in scope. So I've decided to break off these couple patches into their own series so they can be reviewed more easily. This should also let them be merged in faster as I suspect it'll ta

Re: [PATCH] wt-status.c: Modified status message shown for a parent-less branch

Jeff King writes: > But I'm not sure it's actually helping for > some of these cases. E.g.: > >> -status_printf_ln(s, c, _("Changes not staged for commit:")); >> +if (s->commit_template) >> +status_printf_ln(s, c, _("Changes not staged for commit:")); >> +else >> +

Re: [PATCHv2.1] revision.h: turn rev_info.early_output back into an unsigned int

On Sat, Jun 10, 2017 at 01:41:01PM +0200, SZEDER Gábor wrote: > rev_info.early_output started out as an unsigned int in cdcefbc97 (Add > "--early-output" log flag for interactive GUI use, 2007-11-03), but > later it was turned into a single bit in a bit field in cc243c3ce > (show: --ignore-missing

Re: [PATCH v2 00/32] repository object

On Mon, Jun 12, 2017 at 01:04:09PM -0700, Jonathan Tan wrote: > > I'm not sure I know what you mean by config variables which are static, > > are you referring to the in-memory options which are populated by > > querying the config? Those I wouldn't want to see placed in a > > 'repository object'

Re: [PATCH v2 32/32] ls-files: use repository object

On 06/10, Junio C Hamano wrote: > Brandon Williams writes: > > >> - if (read_cache() < 0) > >> + if (repo_read_index(the_repository)) > > > > oops, looks like this should have been: > > Queued, with this fix-up already applied. > > It had a bit of conflicts with topics in flight that may adde

Re: [PATCH v2 00/32] repository object

On Sun, Jun 11, 2017 at 10:24:12PM -0700, Stefan Beller wrote: > On Fri, Jun 9, 2017 at 11:07 PM, Jeff King wrote: > > On Fri, Jun 09, 2017 at 05:40:34PM -0700, Jonathan Tan wrote: > > > >> Before I get into the details, I have some questions: > >> > >> 1. I am concerned that "struct repository"

Re: [PATCH] wt-status.c: Modified status message shown for a parent-less branch

On Mon, Jun 12, 2017 at 11:28:56AM -0700, Junio C Hamano wrote: > Kaartic Sivaraam writes: > > >> Adding a bit to "struct wt_status" is a good first step to allow all > >> three (i.e. in addition to "Initial commit" and "Changes to be > >> committed", "Changes not staged for commit" is the other

Re: [RFC PATCH 2/4] sha1_file: extract type and size from object_info

On Mon, Jun 12, 2017 at 12:52:54PM -0700, Jonathan Tan wrote: > > I like the idea of consolidating the logic. But I can't help but feel > > that pulling these fields out of object_info is a step backwards. The > > point of that struct is to let the caller specify which aspects of the > > object th

Re: [PATCH] strbuf: let strbuf_addftime handle %z and %Z itself

On Mon, Jun 12, 2017 at 09:02:32PM +0200, Ævar Arnfjörð Bjarmason wrote: > > I think the main problem is that the mapping isn't just "JST->+0900". > > It's a set of rules that depend on the specific time being converted. So > > it's true that at some time t, +0900 may mean JST or KST or whatever.

Re: [RFC PATCH 1/4] sha1_file: teach packed_object_info about typename

Jonathan Tan writes: > In commit 46f0344 ("sha1_file: support reading from a loose object of > unknown type", 2015-05-06), "struct object_info" gained a "typename" > field that could represent a type name from a loose object file, whether > valid or invalid, as opposed to the existing "typep" whi

Re: [PATCH v2 8/8] Use the early config machinery to expand aliases

Jeff King writes: > On Sat, Jun 10, 2017 at 06:07:30AM -0400, Jeff King wrote: > >> But couldn't we just unconditionally do: >> >> setup_git_directory_gently(); >> >> here to move into the top-level if there is one, without caring about >> cdup_dir at all? > > IOW, drop your patch 4, and then

Re: [PATCHv2 1/5] revision.h: turn rev_info.early_output back into an unsigned int

Jeff King writes: > On Fri, Jun 09, 2017 at 08:17:29PM +0200, SZEDER Gábor wrote: > >> rev_info.early_output started out as an unsigned int in cdcefbc97 (Add >> "--early-output" log flag for interactive GUI use, 2007-11-03), but >> later it was turned into a single bit in a bit field in cc243c3ce

Re: [PATCH v2 00/32] repository object

On Mon, 12 Jun 2017 12:11:21 -0700 Brandon Williams wrote: > On 06/12, Jonathan Tan wrote: > > On Sat, 10 Jun 2017 02:07:12 -0400 > > Jeff King wrote: > > > > > I do agree that "pass just what the sub-function needs" is a good rule > > > of thumb. But the reason that these are globals in the fi

Re: [PATCH v2 04/32] config: don't implicitly use gitdir

On 06/08, Brandon Williams wrote: > Commit 2185fde56 (config: handle conditional include when $GIT_DIR is > not set up) added a 'git_dir' field to the config_options struct. Let's > use this option field explicitly all the time instead of occasionally > falling back to calling 'git_pathdup("config

Re: [RFC PATCH 2/4] sha1_file: extract type and size from object_info

On Sat, 10 Jun 2017 03:01:33 -0400 Jeff King wrote: > On Fri, Jun 09, 2017 at 12:23:24PM -0700, Jonathan Tan wrote: > > > Looking at the 3 primary functions (sha1_object_info_extended, > > read_object, has_sha1_file_with_flags), they independently implement > > mechanisms such as object replacem

Re: [PATCH v2 00/32] repository object

On 06/12, Jonathan Tan wrote: > On Sat, 10 Jun 2017 02:07:12 -0400 > Jeff King wrote: > > > I do agree that "pass just what the sub-function needs" is a good rule > > of thumb. But the reason that these are globals in the first place is > > that there are a ton of them, and they are used at the l

Re: [PATCH v2 00/32] repository object

On Sat, 10 Jun 2017 17:43:29 -0700 Brandon Williams wrote: > I disagree with a few points of what jonathan said (mostly about > removing the config from the repo object, as I like the idea of nothing > knowing about a 'config_set' object) and I think this problem could be > solved in a couple way

Re: [PATCH] strbuf: let strbuf_addftime handle %z and %Z itself

On Mon, Jun 12, 2017 at 8:20 PM, Jeff King wrote: > On Mon, Jun 12, 2017 at 07:53:21PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> >> Of course we can never know if you were in Tokyo or Seul from the info >> >> in the commit object, but we don't need to, it's enough that we just >> >> emit JST for

Re: [PATCH v2 00/32] repository object

On Sat, 10 Jun 2017 02:07:12 -0400 Jeff King wrote: > I do agree that "pass just what the sub-function needs" is a good rule > of thumb. But the reason that these are globals in the first place is > that there are a ton of them, and they are used at the lowest levels of > call chains. So I have a

Re: [PATCH] wt-status.c: Modified status message shown for a parent-less branch

Kaartic Sivaraam writes: >> Adding a bit to "struct wt_status" is a good first step to allow all >> three (i.e. in addition to "Initial commit" and "Changes to be >> committed", "Changes not staged for commit" is the other one that >> shares this potential confusion factor) to be phrased in a way

Re: [PATCH 1/1] lock_packed_refs(): fix cache validity check

On Mon, Jun 12, 2017 at 10:06:13AM +0200, Michael Haggerty wrote: > So instead: > > * Extract a function `validate_packed_ref_cache()` that does the > validity check independent of whether the lock is held. > > * Change `get_packed_ref_cache()` to call the new function, but only > if the loc

Re: [PATCH] strbuf: let strbuf_addftime handle %z and %Z itself

On Mon, Jun 12, 2017 at 07:53:21PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> Of course we can never know if you were in Tokyo or Seul from the info > >> in the commit object, but we don't need to, it's enough that we just > >> emit JST for +0900 and anyone reading the output has at least some > >

Re: [PATCH] strbuf: let strbuf_addftime handle %z and %Z itself

Ævar Arnfjörð Bjarmason writes: > On Mon, Jun 12, 2017 at 6:56 PM, Ulrich Mueller wrote: > >> Please don't. Outputting invented information for something that >> really isn't in the data is worse than outputting no information at >> all. > > It's not invented information. %z being +0900 is the s

Re: bug? fetching from empty unnamed remote repos

David Turner writes: > $ git init empty-1 > $ git init empty-2 > $ cd empty-1 > $ git fetch ../empty-2 > fatal: Couldn't find remote ref HEAD > fatal: The remote end hung up unexpectedly The current repository does not know anything about empty-2 repository. It does not have [remote "name"] se

Re: [PATCH] send-email: Add tocmd option to suppress-cc

Junio C Hamano writes: > Viresh Kumar writes: > >> On 18-05-17, 17:05, Viresh Kumar wrote: >>> This adds tocmd option to suppress-cc command which already supports >>> cccmd and others. >>> >>> Signed-off-by: Viresh Kumar >>> --- >>> Documentation/git-send-email.txt | 1 + >>> git-send-email.

Re: 'pu' broken at t5304 tonight

On 06/11, Christian Couder wrote: > On Sat, Jun 10, 2017 at 9:05 PM, Kevin Daudt wrote: > > On Sat, Jun 10, 2017 at 02:48:36PM +0200, Kevin Daudt wrote: > > >> For me, this bisects to the latest merge: > >> > >> 2047eebd3 (Merge branch 'bw/repo-object' into pu, 2017-06-10), but > >> neither of th

Re: Small issue with "add untracked" option of 'git add -i'

Junio C Hamano writes: > After prompting to get the list of desired files, if the user chose > nothing, the message is shown. "No untracked files chosen." is > probably what the code wants to say, I would think. Together with your other wishes, perhaps something like this is what you have in m

Re: Small issue with "add untracked" option of 'git add -i'

On Mon, 2017-06-12 at 10:38 -0700, Junio C Hamano wrote: > After prompting to get the list of desired files, if the user chose > nothing, the message is shown.  "No untracked files chosen." is > probably what the code wants to say, I would think. > That does seem to be a more apt message to be sho

Re: [PATCH] strbuf: let strbuf_addftime handle %z and %Z itself

On Mon, Jun 12, 2017 at 6:56 PM, Ulrich Mueller wrote: >> On Mon, 12 Jun 2017, Ęvar Arnfjörš Bjarmason wrote: > >> On Mon, Jun 12, 2017 at 5:12 PM, Junio C Hamano wrote: >>> René Scharfe writes: Yes, or you could look up a time zone name somewhere else -- except we don't have a way

bug? fetching from empty unnamed remote repos

$ git init empty-1 $ git init empty-2 $ cd empty-1 $ git fetch ../empty-2 fatal: Couldn't find remote ref HEAD fatal: The remote end hung up unexpectedly But: $ git init empty-1 $ git init empty-2 $ cd empty-1 $ git remote add other ../empty-2 $ git fetch other # this works I haven't spent a lo

Re: Small issue with "add untracked" option of 'git add -i'

Kaartic Sivaraam writes: > * He chooses to use 'git add -i' to stage changes > * He chooses option 4, accidentally, instead of option 5. He is shown > the following menu, > >> *** Commands *** >>   1: status   2: update   3: revert   4: add >> untracked >>   5: patch   6: diff   

Re: [PATCH] strbuf: let strbuf_addftime handle %z and %Z itself

On Mon, Jun 12, 2017 at 06:58:13PM +0200, René Scharfe wrote: > > We could also simply replace "%Z" with the empty string, as the the > > POSIX strftime() documentation allows for: > > http://pubs.opengroup.org/onlinepubs/009695399/functions/strftime.html > > ("Replaced by the timezone name or abb

Re: git push recurse.submodules behavior changed in 2.13

On Sat, Jun 10, 2017 at 6:28 AM, John Shahid wrote: > bump. it's been a while and I'm still not clear what the next steps > are. I'm happy to send a patch but I would like to get a consensus > first. What do you want a consensus on? (Is the change in 2.13 a bug or feature? I considered it enough

Re: [PATCH] Fix KeyError "fileSize" in verbose mode

Sergey Yurzin writes: > Subject: Re: [PATCH] Fix KeyError "fileSize" in verbose mode The convention around here is to think how a single change appears in "git shortlog --no-merges" output. The above commit title does not tell readers of "shortlog" what the change is about in the context of the

Re: [PATCH] strbuf: let strbuf_addftime handle %z and %Z itself

Am 12.06.2017 um 18:16 schrieb Ævar Arnfjörð Bjarmason: On Mon, Jun 12, 2017 at 5:12 PM, Junio C Hamano wrote: René Scharfe writes: Am 07.06.2017 um 10:17 schrieb Jeff King: On Sat, Jun 03, 2017 at 12:40:34PM +0200, René Scharfe wrote: Duplicates strbuf_expand to a certain extent, but not

Re: [PATCH] strbuf: let strbuf_addftime handle %z and %Z itself

> On Mon, 12 Jun 2017, Ævar Arnfjörð Bjarmason wrote: > On Mon, Jun 12, 2017 at 5:12 PM, Junio C Hamano wrote: >> René Scharfe writes: >>> Yes, or you could look up a time zone name somewhere else -- except we >>> don't have a way to do that, at least for now. >> >> Is that only "for now"?

Re: Feature Request: Show status of the stash in git status command

liam Beguin writes: > +static int stash_count_refs(struct object_id *ooid, struct object_id *noid, > + const char *email, timestamp_t timestamp, int tz, > + const char *message, void *cb_data) > +{ > + int *c = cb_data; > + (*c)++; > + r

Re: [PATCH] strbuf: let strbuf_addftime handle %z and %Z itself

On Mon, Jun 12, 2017 at 5:12 PM, Junio C Hamano wrote: > René Scharfe writes: > >> Am 07.06.2017 um 10:17 schrieb Jeff King: >>> On Sat, Jun 03, 2017 at 12:40:34PM +0200, René Scharfe wrote: Duplicates strbuf_expand to a certain extent, but not too badly, I think. Leaves the door open

Re: [PATCH] send-email: Add tocmd option to suppress-cc

Viresh Kumar writes: > On 18-05-17, 17:05, Viresh Kumar wrote: >> This adds tocmd option to suppress-cc command which already supports >> cccmd and others. >> >> Signed-off-by: Viresh Kumar >> --- >> Documentation/git-send-email.txt | 1 + >> git-send-email.perl | 8 >> 2

Re: [PATCH v2] doc: fix location of index in worktree scenatio

Torsten Bögershausen writes: > Thanks for working on this (and keeping me in cc) > > The commit head line does not fully match my expactions: > "doc: fix location of index in worktree scenatio" > "doc:" is OK, but is the "location of index" fixed ? > Actually something that includes the important

Re: [PATCH v1] Configure Git contribution guidelines for github.com

"Philip Oakley" writes: > From: "Lars Schneider" >> Many open source projects use github.com for their contribution process. >> Although we mirror the Git core repository to github.com [1] we do not >> use any other github.com service. This is unknown/unexpected to a >> number of (potential) con

Re: Missing git-2.13.1.* files in the SHA256 sums

Andrés Sicard-Ramírez writes: > The git-2.13.1.* files are missing in > > https://www.kernel.org/pub/software/scm/git/sha256sums.asc > > All the best, These checksum files are auto-generated as part of the mirroring infrastructure among the kernel.org servers, and those who upload to kernel.or

Re: [PATCH v2] t3200: add test for single parameter passed to -m option

Sahil Dua writes: > Add a test for the case when only one parameter is passed to '-m' > (move/rename) option. > > For example - if 'git branch -m bbb' is run, it should rename the > currently checked out branch to bbb. There was no test for this > particular case with only one parameter for -m op

Re: [PATCH] strbuf: let strbuf_addftime handle %z and %Z itself

René Scharfe writes: > Am 07.06.2017 um 10:17 schrieb Jeff King: >> On Sat, Jun 03, 2017 at 12:40:34PM +0200, René Scharfe wrote: >>> Duplicates strbuf_expand to a certain extent, but not too badly, I >>> think. Leaves the door open for letting strftime handle the local >>> case. >> >> I guess y

Small issue with "add untracked" option of 'git add -i'

Hello all, There seems to be a small issue with the output of the "add untracked" option of 'git add -i'. Consider the following scenario, * A user makes a change to a tracked file * His repo has a few untracked files which he has left it in that way intentionally * He chooses to use 'git add -i'

Re: [PATCH v2] doc: fix location of index in worktree scenatio

Am 12.06.2017 um 12:03 schrieb Torsten Bögershausen: > Thanks for working on this (and keeping me in cc) > > The commit head line does not fully match my expactions: > "doc: fix location of index in worktree scenatio" > "doc:" is OK, but is the "location of index" fixed ? > Actually something that

Re: [PATCH v2] doc: fix location of index in worktree scenatio

Thanks for working on this (and keeping me in cc) The commit head line does not fully match my expactions: "doc: fix location of index in worktree scenatio" "doc:" is OK, but is the "location of index" fixed ? Actually something that includes the important stuff: "doc" "fix" "normalize the line

  1   2   >