Re: Git Daemon on Windows fatal error.

On 31/05/17 21:10, Hector Santos wrote: Hi, I am relatively new to GIT (coming from CVS and SVN) and I am trying to setup "Git Daemon" on windows. I got it working for Local network communications: d:\local\wc5\testgit>git clone git://localhost/http clone10 Cloning into 'clone10'... remote:

Re: revision API design, was Re: [PATCH v4 02/10] rebase -i: generate the script via rebase--helper

Junio C Hamano writes: > The current API to hide such an embarrasing but necessary > implementation details from the code that does not need to know > them, i.e. the consumer of rev-info structure with various settings, > is to invoke the command line parser. Bypassing and going directly > down

Re: [PATCH 8/8] t0012: test "-h" with builtins

On Thu, Jun 01, 2017 at 02:54:08PM +0900, Junio C Hamano wrote: > Junio C Hamano writes: > > > For now, I will mix this in when queuing the whole thing in 'pu', as > > I hate to push out something that does not even work for me to the > > general public. > > > > -- >8 -- > > Subject: [PATCH] di

Re: [PATCH 8/8] t0012: test "-h" with builtins

On Thu, Jun 01, 2017 at 02:42:13PM +0900, Junio C Hamano wrote: > For now, I will mix this in when queuing the whole thing in 'pu', as > I hate to push out something that does not even work for me to the > general public. > > -- >8 -- > Subject: [PATCH] diff- and log- family: handle "git cmd -h"

Re: [PATCH 8/8] t0012: test "-h" with builtins

Junio C Hamano writes: > For now, I will mix this in when queuing the whole thing in 'pu', as > I hate to push out something that does not even work for me to the > general public. > > -- >8 -- > Subject: [PATCH] diff- and log- family: handle "git cmd -h" early > ... And then the check_help_opt

Re: [PATCH 8/8] t0012: test "-h" with builtins

Junio C Hamano writes: > Heh, I found another ;-) > > 95e98cd9 ("revision.c: use refs_for_each*() instead of > for_each_*_submodule()", 2017-04-19), which is in the middle of > Duy's nd/prune-in-worktree series, does this: > ... > when jk/consistent-h is merged into it and then "git diff-files

Re: [PATCH 8/8] t0012: test "-h" with builtins

On Thu, Jun 01, 2017 at 01:17:55PM +0900, Junio C Hamano wrote: > Jeff King writes: > > > Anyway, the problem is sk/dash-is-previous, specifically fc5684b47 > > (revision.c: args starting with "-" might be a revision, 2017-02-25). It > > looks like the revision parser used to just bail on "-h",

[PATCH v3] pull: ff --rebase --autostash works in dirty repo

When `git pull --rebase --autostash` in a dirty repository resulted in a fast-forward, nothing was being autostashed and the pull failed. This was due to a shortcut to avoid running rebase when we can fast-forward, but autostash is ignored on that codepath. Now we will only take the shortcut if au

Re: [PATCH 8/8] t0012: test "-h" with builtins

Jeff King writes: > Anyway, the problem is sk/dash-is-previous, specifically fc5684b47 > (revision.c: args starting with "-" might be a revision, 2017-02-25). It > looks like the revision parser used to just bail on "-h", because > revision.c would say "I don't recognize this" and then cmd_rev_li

Re: [PATCH 1/2] format-patch: have progress option while generating patches

Jeff King writes: > As I said above, I think I'd prefer it to require "--progress", as > format-patch is quite often used as plumbing. Yes, that sounds sensible. Initially, my reaction was "Why do we even need --progress for format-patch, when it gives one-line per patch output to show the prog

Re: [PATCH v3 4/4] stash: implement builtin stash

On Wed, May 31, 2017 at 08:29:43PM -0700, Joel Teichroeb wrote: > I'm running into a lot of trouble using argv_array_clear. It seems > that some of the builtin git cmd functions move the parameters around, > and write new pointers to argv. There's three options I have now, and > I'm not sure which

Re: [PATCH v3 4/4] stash: implement builtin stash

I'm running into a lot of trouble using argv_array_clear. It seems that some of the builtin git cmd functions move the parameters around, and write new pointers to argv. There's three options I have now, and I'm not sure which is the best one. 1. Fix all the builtin cmd functions that I use to not

Re: bug: `git log --grep ... --invert-grep --author=...` negates / ignores --author

Ævar Arnfjörð Bjarmason writes: > $ git log --grep=bar --invert-grep --author=Ævar --pretty=format:%an > -100 origin/pu |sort|uniq -c|sort -nr > 78 Junio C Hamano > 14 Jeff King > 2 Andreas Heiduk > 1 Sahil Dua > 1 Rikard Falkeborn > 1 Johannes Sixt > 1 Joh

Re: [PATCH] docs: fix literal quoted spaces

Jeff King writes: > On Wed, May 31, 2017 at 04:06:24PM +0100, Adam Dinwoodie wrote: > >> When compiling the documentation, asciidoc thinks a backtick surrounded >> by whitespace shouldn't be interpreted as marking the start or end of a >> literal. In most cases, that's useful behaviour, but in t

Re: [PATCH 1/3] rebase -i: Add test for reflog message

Phillip Wood writes: > From: Phillip Wood > > Check that the reflog message written to the branch reflog when the > rebase is completed is correct. This checks for regressions for the > fix in commit > 4ab867b8fc rebase -i: fix reflog message > > Signed-off-by: Phillip Wood > --- Good idea. T

Re: [PATCH 2/3] rebase: Add tests for console output

Phillip Wood writes: > On 31/05/17 11:42, Phillip Wood wrote: >> From: Phillip Wood >> >> Check the console output when using --autostash and the stash applies >> cleanly is what we expect. To avoid this test depending on commit and >> stash hashes it uses sed to replace them with XXX. The sed s

Re: [PATCH v2] pull: ff --rebase --autostash works in dirty repo

Tyler Brazier writes: > When `git pull --rebase --autostash` in a dirty repository resulted in a > fast-forward, nothing was being autostashed and the pull failed. This > was due to a shortcut to avoid running rebase when we can fast-forward, > but autostash is ignored on that codepath. > > Now w

Re: [PATCH/RFC v2 2/6] branch: add copy branch option

Sahil Dua writes: > Adds copy branch option available using -c or -C (forcefully). > > Includes a lot of function renames and their signature changes in order > to introduce a new function parameter - flag 'copy' which determines > whether those functions should do operation copy or move. > > Add

Re: [Bug] git branch -v has problems with carriage returns

Atousa Duprat writes: > Here is my first attempt at fixing the issue. > > There are two problems in ref-filter.c: > > First, copy_subject() has been modified to turn '\n' into a space and > every other ascii control character to be ignored. > > Second, find_subpos() doesn't realize that a line th

Re: What's cooking in git.git (May 2017, #08; Mon, 29)

Ævar Arnfjörð Bjarmason writes: > On Mon, May 29, 2017 at 8:23 AM, Junio C Hamano wrote: >> * ab/pcre-v2 (2017-05-26) 7 commits >> - grep: add support for PCRE v2 >> - grep: un-break building with PCRE < 8.20 >> - grep: un-break building with PCRE < 8.32 >> - grep: add support for the PCRE v

[PATCHv3 4/4] builtin/fetch.c: respect 'submodule.recurse' option

Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- builtin/fetch.c | 7 +++ t/t5526-fetch-submodules.sh | 10 ++ 2 files changed, 17 insertions(+) diff --git a/builtin/fetch.c b/builtin/fetch.c index 5f2c2ab23e..c1ec3b03c3 100644 --- a/builtin/fetch.c +++ b/

[PATCHv3 2/4] builtin/grep.c: respect 'submodule.recurse' option

In builtin/grep.c we parse the config before evaluating the command line options. This makes the task of teaching grep to respect the new config option 'submodule.recurse' very easy by just parsing that option. As an alternative I had implemented a similar structure to treat submodules as the fetc

[PATCHv3 3/4] builtin/push.c: respect 'submodule.recurse' option

The closest mapping from the boolean 'submodule.recurse' set to "yes" to the variety of submodule push modes is "on-demand", so implement that. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- builtin/push.c | 4 t/t5531-deep-submodule-push.sh | 21 ++

[PATCHv3 1/4] Introduce 'submodule.recurse' option for worktree manipulators

Any command that understands '--recurse-submodules' can have its default changed to true, by setting the new 'submodule.recurse' option. This patch includes read-tree/checkout/reset for working tree manipulating commands. Later patches will cover other commands. Signed-off-by: Stefan Beller Sign

[PATCHv3 0/4] A reroll of sb/submodule-blanket-recursive

v3: * rerolling only the top-4 patches of sb/submodule-blanket-recursive. (base: 1d789d089280539ca39b83aabb67860929d39b75) * fixes function declarations that should be static, thanks Ramsay! v2: * A reroll of sb/submodule-blanket-recursive. * This requires ab/grep-preparatory-cleanup * It change

[PATCH] diff.c: color moved lines differently

When a patch consists mostly of moving blocks of code around, it can be quite tedious to ensure that the blocks are moved verbatim, and not undesirably modified in the move. To that end, color blocks that are moved within the same patch differently. For example (OM, del, add, and NM are different c

[PATCH v2] send-email: Net::SMTP::starttls was introduced in v2.34 (Re: [BUG] git-send-email broken: Can't locate object method "starttls")

Subject: send-email: Net::SMTP::starttls was introduced in v2.34 We cannot rely on the starttls method being present in Net::SMTP until c274b798e6881a941d941808c6d89966975cb8c8 (Merge branch 'ipv6_ssl' of https://github.com/noxxi/perl-libnet into noxxi-ipv6_ssl, 2014-06-02), which set the module v

Re: [PATCH] docs/config: mention protocol implications of url.insteadOf

On 05/31, Jeff King wrote: > On Fri, May 26, 2017 at 11:22:37AM -0500, Elliott Cable wrote: > > > 1. Most simply, better documentation: mention `GIT_PROTOCOL_FROM_USER` > >explicitly in the documentation of/near `insteadOf`, most > >particularly in the README for `contrib/persistent-https`

[PATCH/RFC v2 4/6] config: modify function signature to include copy argument

Changed git_config_rename_section to git_config_copy_or_rename_section which will now accept another argument flag "copy" which will determine if the function will copy the config section or just rename it. Again, this includes changes at a lot of unrelated other places wherever the renamed and up

[PATCH/RFC v2 1/6] branch: add tests for new copy branch feature

Adds a few basic tests for getting any suggestions/feedback about expected behavior for this new feature. Aim is to have an option -c for copying a branch just like -m option for renaming a branch. Signed-off-by: Sahil Dua --- t/t3200-branch.sh | 53 ++

[PATCH/RFC v2 6/6] branch: don't copy or rename config when same branch name

It doesn't make sense to trigger config section copy or rename method if both the branch names are same. For example - git branch -C a a In such a case, it shouldn't try to copy or rename the git config section. Signed-off-by: Sahil Dua --- builtin/branch.c | 2 +- 1 file changed, 1 insertion(+

[PATCH/RFC v2 5/6] config: add copy config section logic

Adds implementation for copying the config section while copying a branch. While we're parsing the config file, we need to make sure we start copying the config section once we find the matching block for our branch1 (for example when running 'git branch -c branch1 branch2'). There is one flag us

[PATCH/RFC v2 2/6] branch: add copy branch option

Adds copy branch option available using -c or -C (forcefully). Includes a lot of function renames and their signature changes in order to introduce a new function parameter - flag 'copy' which determines whether those functions should do operation copy or move. Additionally, this changes a lot of

[PATCH/RFC v2 3/6] config: abstract out create section from key logic

Abstracts out the logic for creating string buffer from given key for example - 'branch.b' and returns '[branch "b"]'. We want to keep the original config section intact in case of copy operation. For this we need to fetch the section with updated new branch name so that we can write that to the c

Re: [PATCH] send-email: Net::SMTP::starttls was introduced in v3.01 (Re: [BUG] git-send-email broken: Can't locate object method "starttls")

Eric Biggers wrote: > On Wed, May 31, 2017 at 03:44:15PM -0700, Jonathan Nieder wrote: >> Subject: send-email: Net::SMTP::starttls was introduced in v3.01 >> >> We cannot rely on the starttls method being present in the copy >> of Net::SMTP shipped with perl until v5.21.5~169 (Update libnet to >>

Re: [PATCH 00/31] repository object

On 05/31, Stefan Beller wrote: > On Wed, May 31, 2017 at 2:43 PM, Brandon Williams wrote: > > Given the vast interest expressed when I sent out my RFC series I decided it > > would be worth it to invest more time to making a repository object a > > reality. > > > > This series is an extension of

Re: [PATCH] send-email: Net::SMTP::starttls was introduced in v3.01 (Re: [BUG] git-send-email broken: Can't locate object method "starttls")

On Wed, May 31, 2017 at 03:44:15PM -0700, Jonathan Nieder wrote: > Subject: send-email: Net::SMTP::starttls was introduced in v3.01 > > We cannot rely on the starttls method being present in the copy > of Net::SMTP shipped with perl until v5.21.5~169 (Update libnet to > CPAN version 3.01, 2014-10-

Re: [PATCH 00/31] repository object

On Wed, May 31, 2017 at 2:43 PM, Brandon Williams wrote: > Given the vast interest expressed when I sent out my RFC series I decided it > would be worth it to invest more time to making a repository object a reality. > > This series is an extension of the last series I sent out (in that ls-files i

Re: [PATCH v2] send-email: Net::SMTP::SSL is obsolete, use only when necessary

Hi, Jun 01, 2017 at 07:39:16AM +0900, Junio C Hamano wrote: > Jonathan Nieder writes: >> This broke git send-email for me. The error message is >> >> Can't locate object method "starttls" via package "Net::SMTP" at >> /usr/lib/git-core/git-send-email line 1410. >> >> Is 1.28 the right minimu

Re: [PATCH] send-email: Net::SMTP::starttls was introduced in v3.01 (Re: [BUG] git-send-email broken: Can't locate object method "starttls")

Jonathan Nieder writes: > Subject: send-email: Net::SMTP::starttls was introduced in v3.01 > > We cannot rely on the starttls method being present in the copy > of Net::SMTP shipped with perl until v5.21.5~169 (Update libnet to > CPAN version 3.01, 2014-10-10). > > Reported-by: Brandon Williams

Re: [PATCH v2] send-email: Net::SMTP::SSL is obsolete, use only when necessary

Dennis Kaarsemaker writes: > Second ping. This problem is not going away, so if this solution is not > acceptable, I'd like to know what needs to be improved. Perhaps you needed to actually test with older installation that people have, it seems, between pings. Immediately after this was merged

[PATCH] send-email: Net::SMTP::starttls was introduced in v3.01 (Re: [BUG] git-send-email broken: Can't locate object method "starttls")

Subject: send-email: Net::SMTP::starttls was introduced in v3.01 We cannot rely on the starttls method being present in the copy of Net::SMTP shipped with perl until v5.21.5~169 (Update libnet to CPAN version 3.01, 2014-10-10). Reported-by: Brandon Williams Reported-by: Eric Biggers Signed-off-

Re: [PATCH v2] send-email: Net::SMTP::SSL is obsolete, use only when necessary

Jonathan Nieder writes: > Dennis Kaarsemaker wrote: > >> Net::SMTP itself can do the necessary SSL and STARTTLS bits just fine >> since version 1.28, and Net::SMTP::SSL is now deprecated. Since 1.28 >> isn't that old yet, keep the old code in place and use it when >> necessary. > > This broke git

[BUG] git-send-email broken: Can't locate object method "starttls"

Hi, There seems to be a bug in 'git send-email' caused by this commit: commit 0ead000c3aca13a10ae51a3c74c866981e0d33b8 Author: Dennis Kaarsemaker Date: Fri Mar 24 22:37:32 2017 +0100 send-email: Net::SMTP::SSL is obsolete, use only when necessary When running git send-ema

Re: [PATCH 2/2] rebase: turn on progress option by default for format-patch

On Wed, May 31, 2017 at 08:04:27AM -0700, Kevin Willford wrote: > This change passes the progress option of format-patch by > default and passes the -q --quiet option through to the > format-patch call so that it is respected as well. That makes sense. Is it a bug that we aren't propagating "-q"

Re: [PATCH 0/5] Some submodule bugfixes and "reattaching detached HEADs"

On Mon, May 1, 2017 at 9:04 PM, Stefan Beller wrote: >> >>> I don't know why submodules were originally designed to be in a >>> detached HEAD state but I much prefer working on branches (as I'm sure >>> many other developers do) so the prospect of this becoming the norm is >>> exciting! :D >> > >

Re: [PATCH 00/33] object id conversion (grep and diff)

On Tue, May 30, 2017 at 10:30:36AM -0700, Brandon Williams wrote: > A month or so ago I thought I would lend a hand to Brian and do a round of > conversions from sha1 -> struct object_id. Now that Brian's latest series has > hit master I can finally send these patches out. > > The first couple pa

Re: [PATCH 22/33] notes-merge: convert notes_merge* to struct object_id

On Tue, May 30, 2017 at 10:30:58AM -0700, Brandon Williams wrote: > @@ -596,47 +596,47 @@ int notes_merge(struct notes_merge_options *o, > /* Find merge bases */ > bases = get_merge_bases(local, remote); > if (!bases) { > - base_sha1 = null_sha1; > - base_t

Re: [PATCH 1/2] format-patch: have progress option while generating patches

On Wed, May 31, 2017 at 08:04:26AM -0700, Kevin Willford wrote: > When generating patches for the rebase command if the user does > not realize the branch they are rebasing onto is thousands of > commits different there is no progress indication after initial > rewinding message. > > This patch a

Re: [PATCH v2] send-email: Net::SMTP::SSL is obsolete, use only when necessary

Hi, Dennis Kaarsemaker wrote: > Net::SMTP itself can do the necessary SSL and STARTTLS bits just fine > since version 1.28, and Net::SMTP::SSL is now deprecated. Since 1.28 > isn't that old yet, keep the old code in place and use it when > necessary. This broke git send-email for me. The error

[PATCH 04/31] setup: don't perform lazy initialization of repository state

Under some circumstances (bogus GIT_DIR value or the discovered gitdir is '.git') 'setup_git_directory()' won't initialize key repository state. This leads to inconsistent state after running the setup code. To account for this inconsistent state, lazy initialization is done once a caller asks for

[PATCH 09/31] setup: add comment indicating a hack

'GIT_TOPLEVEL_PREFIX_ENVIRONMENT' was added in (b58a68c1c setup: allow for prefix to be passed to git commands) to aid in fixing a bug where 'ls-files' and 'grep' were not able to properly recurse when called from within a subdirectory. Add a 'NEEDSWORK' comment indicating that this envvar should

[PATCH 10/31] config: migrate the_configset to the_repository

Migrate the default config to be stored within 'the_repository'. Signed-off-by: Brandon Williams --- config.c | 185 ++- config.h | 1 + repo.c | 21 repo.h | 11 4 files changed, 146 insertions(+), 72 deletions(-)

[PATCH 31/31] ls-files: use repository object

Convert ls-files to use a repository struct and recurse submodules inprocess. Signed-off-by: Brandon Williams --- builtin/ls-files.c | 211 ++--- git.c | 2 +- repo.c | 3 + repo.

[PATCH 23/31] 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 c37e9de11..f9578cf9f 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -121,7 +121,8 @@ static

[PATCH 25/31] 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 d00ca7810..2838e2f75 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -293,14 +293,14 @@ static void show_ce_

[PATCH 17/31] 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 ff3e72657..824b606fa 100644 --- a/convert.c +++ b/convert.c @@ -1109,7 +1109,8 @@ int convert_to_git(const

[PATCH 26/31] 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 2838e2f75..289c6b2a5 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -322,10 +322,11 @@ static void show_ru

[PATCH 27/31] 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 289c6b2a5..e2d8fb7f6 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -381,30 +381,31 @@ static void

[PATCH 24/31] 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 f9578cf9f..d00ca7810 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -109,13 +109,14 @@ static void show_dir_

[PATCH 30/31] 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 2849c9a65..6a0302a28 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -94

[PATCH 28/31] ls-files: convert show_files to take an index

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index e2d8fb7f6..3061af2c5 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -329,7 +329,7 @@ sta

[PATCH 29/31] 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 3061af2c5..2849c9a65 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -94,6 +94,19 @@ static

[PATCH 21/31] 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 805da4915..3d98084fb 100644 --- a/builtin/commit.c +++ b

[PATCH 20/31] 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 f16ce0053..620487a77 100644 --- a/built

[PATCH 22/31] 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 a5ceeb052..c37e9de11 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -54,17 +54,16 @@ static const cha

[PATCH 19/31] 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 5af6fdf3f..7d2a519da 100644 --- a/convert.c +++ b/convert.c

[PATCH 18/31] convert: convert convert_to_git to take an index

Signed-off-by: Brandon Williams --- apply.c | 2 +- builtin/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(-)

[PATCH 16/31] 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 574003023..ff3e72657 100644 --- a/convert.c +++ b/convert.c @@ -219,13 +219,13 @@ static void check_safe_crlf(const char *path, enum crlf_a

[PATCH 12/31] submodule-config: store the_submodule_cache in the_repository

Refactor how 'the_submodule_cache' is handled so that it can be stored inside of a repository object. Also migrate 'the_submodule_cache' to be stored in 'the_repository'. Signed-off-by: Brandon Williams --- repo.c | 6 + repo.h | 2 ++ submodule-config.c | 71 +

[PATCH 08/31] environment: store worktree in the_repository

Migrate 'work_tree' to be stored in 'the_repository'. Signed-off-by: Brandon Williams --- environment.c | 9 - repo.c| 7 +++ repo.h| 2 ++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/environment.c b/environment.c index a0519f4f3..2722ebb9f 100644

[PATCH 07/31] environment: place key repository state in the_repository

Migrate 'git_dir', 'git_common_dir', 'git_object_dir', 'git_index_file', 'git_graft_file', and 'namespace' to be stored in 'the_repository'. Signed-off-by: Brandon Williams --- cache.h | 1 - environment.c | 65 ++- path.c| 1

[PATCH 13/31] repo: add repo_read_gitmodules

Teach the repo object to be able to populate the submodule_cache by reading the repository's gitmodules file. Signed-off-by: Brandon Williams --- repo.c | 14 ++ repo.h | 1 + 2 files changed, 15 insertions(+) diff --git a/repo.c b/repo.c index 13b7d244f..6f7b2015f 100644 --- a/rep

[PATCH 03/31] 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 14/31] submodule: convert is_submodule_initialized to work on a repository

Convert 'is_submodule_initialized()' to take a repository object and while we're at it, lets rename the function to 'is_submodule_active()' and remove the NEEDSWORK comment. Signed-off-by: Brandon Williams --- builtin/grep.c | 3 ++- builtin/submodule--helper.c | 9 + conf

[PATCH 15/31] 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 c4357dc30..f16ce0053 100644 --- a/builtin/ls-files.c +++ b/built

[PATCH 11/31] repo: add index_state to struct repo

Signed-off-by: Brandon Williams --- repo.c | 17 + repo.h | 3 +++ 2 files changed, 20 insertions(+) diff --git a/repo.c b/repo.c index c67cad5a2..c79d29534 100644 --- a/repo.c +++ b/repo.c @@ -104,6 +104,17 @@ void repo_read_config(struct repo *repo) git_config_with_opt

[PATCH 00/31] repository object

Given the vast interest expressed when I sent out my RFC series I decided it would be worth it to invest more time to making a repository object a reality. This series is an extension of the last series I sent out (in that ls-files is converted to working on submodules in-process using repository

[PATCH 06/31] repo: introduce the repository object

Introduce the repository object 'struct repo' which can be used hold all state pertaining to a git repository. The aim of object-ifying the repository is to (1) make the code base more readable and easier to reason about and (2) allow for working on multiple repositories, specifically submodules,

[PATCH 05/31] environment: remove namespace_len variable

Use 'skip_prefix' instead of 'starts_with' so that we can drop the need to keep around 'namespace_len'. Signed-off-by: Brandon Williams --- environment.c | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/environment.c b/environment.c index a73b08f5d..e035f6372 100644 -

[PATCH 02/31] 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 01/31] 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 +-

Re: bug: `git log --grep ... --invert-grep --author=...` negates / ignores --author

On Wed, May 31, 2017 at 08:08:54PM +0200, Ævar Arnfjörð Bjarmason wrote: > $ git log --grep=bar --author=Ævar --pretty=format:%an -100 origin/pu > |sort|uniq -c|sort -nr > 5 Ævar Arnfjörð Bjarmason > > $ git log --author=Ævar --pretty=format:%an -100 origin/pu |sort|uniq > -c|sort -nr > 100 Ævar

[PATCH v1] doc: rewrite description for rev-parse --short

`git rev-parse --short` is not a generic modifier but just a variant of `--verify` and considers the given length only as a suggestion to ensure uniqueness. Signed-off-by: Andreas Heiduk --- Documentation/config.txt| 1 + Documentation/git-rev-parse.txt | 12 ++-- 2 files change

Re: [PATCH 30/33] tree-diff: convert diff_tree_paths to struct object_id

On Wed, May 31, 2017 at 05:29:20PM -0400, Jeff King wrote: > Or did you mean that diff_tree_paths() could now take an actual > array-of-struct rather than an array-of-pointer-to-struct? That would > drop the "parents_oid" array entirely. I think that's actually > orthogonal to this change (the sam

Re: [PATCH 30/33] tree-diff: convert diff_tree_paths to struct object_id

On Wed, May 31, 2017 at 11:24:33AM -0700, Stefan Beller wrote: > On Tue, May 30, 2017 at 10:31 AM, Brandon Williams wrote: > > > > Signed-off-by: Brandon Williams > > --- > > combine-diff.c | 10 +- > > diff.h | 4 ++-- > > tree-diff.c| 63 > > +

Re: Coloring

On Wed, May 31, 2017 at 5:10 PM, Irving Rabin wrote: > > Thanks Jeff, my problem has been resolved by Samuel Lijin. > My terminal settings didn't set bold which remained white. I fixed it > and my problem was gone! Specifically, Irving's terminal rendered bold text as white. No bug here :) > Thi

Re: persistent-https, url insteadof, and `git submodule`

On Wed, May 31, 2017 at 04:23:49PM +0200, Ævar Arnfjörð Bjarmason wrote: > > It really is an issue of the user knowing about the problem (and how to > > solve it), and I don't think we can get around that securely. So better > > documentation probably is the right solution. > > > > I'll see if I c

Re: [PATCH 6.5?/8] version: move --build-options to a test helper

On Wed, May 31, 2017 at 07:51:20PM +0200, Ævar Arnfjörð Bjarmason wrote: > Thanks both. It makes sense to discard this patch. > > I wasn't sure whether anyone really cared about this, and thought a > patch was a better starting point of discussion. I will never complain about somebody starting a

Re: Coloring

Thanks Jeff, my problem has been resolved by Samuel Lijin. My terminal settings didn't set bold which remained white. I fixed it and my problem was gone! This issue is closed. Is there any way to retire it? Irving Rabin Software Developer @Edmodo 408-242-1299 On Wed, May 31, 2017 at 2:04 PM, J

Re: Coloring

On Wed, May 31, 2017 at 11:33:31AM -0700, Irving Rabin wrote: > Specifically, if the field is supposed to be white, it doesn't mean it > should be literally 0xFF. It should be the color that I have > configured as White color for my console emulator. > > I like light-screen terminals, and I c

Re: [Bug] git branch -v has problems with carriage returns

On Tue, May 30, 2017 at 10:32 PM, Atousa Duprat wrote: > Here is my first attempt at fixing the issue. Cool you're looking into this. :) > > There are two problems in ref-filter.c: > > First, copy_subject() has been modified to turn '\n' into a space and > every other ascii control character to

Re: [PATCH 2/2] rebase: turn on progress option by default for format-patch

On Wed, May 31, 2017 at 12:46 PM, Kevin Willford wrote: > > I thought about that and certainly could do it but I have found it nice to > have the number of patches that are generated in the output even for a small > number or commits. For example when I run a `git rebase master` and expect >

RE: [PATCH 2/2] rebase: turn on progress option by default for format-patch

> -Original Message- > From: Stefan Beller [mailto:sbel...@google.com] > Sent: Wednesday, May 31, 2017 1:09 PM > To: Kevin Willford > Cc: git@vger.kernel.org; Junio C Hamano ; Kevin > Willford > Subject: Re: [PATCH 2/2] rebase: turn on progress option by default for > format-patch > > On

RE: [PATCH 1/2] format-patch: have progress option while generating patches

> -Original Message- > From: git-ow...@vger.kernel.org [mailto:git-ow...@vger.kernel.org] On > Behalf Of Stefan Beller > Sent: Wednesday, May 31, 2017 12:40 PM > To: Kevin Willford > Cc: git@vger.kernel.org; Junio C Hamano ; Kevin > Willford > Subject: Re: [PATCH 1/2] format-patch: have p

Git Daemon on Windows fatal error.

Hi, I am relatively new to GIT (coming from CVS and SVN) and I am trying to setup "Git Daemon" on windows. I got it working for Local network communications: d:\local\wc5\testgit>git clone git://localhost/http clone10 Cloning into 'clone10'... remote: Counting objects: 526, done. remote: Compre

Re: [PATCH 2/2] rebase: turn on progress option by default for format-patch

On Wed, May 31, 2017 at 8:04 AM, Kevin Willford wrote: > This change passes the progress option of format-patch by > default and passes the -q --quiet option through to the > format-patch call so that it is respected as well. This is not conflicting with Johannes rewrite of rebase in C? (rebase i

Re: Coloring

On Wed, May 31, 2017 at 2:33 PM, Irving Rabin wrote: > > Folks, I am reporting an issue with coloring of the output of Git > commands, like status, diff, etc. > > Specifically, if the field is supposed to be white, it doesn't mean it > should be literally 0xFF. It should be the color that I ha

Re: [PATCH 2/3] rebase: Add tests for console output

On 31/05/17 11:42, Phillip Wood wrote: From: Phillip Wood Check the console output when using --autostash and the stash applies cleanly is what we expect. To avoid this test depending on commit and stash hashes it uses sed to replace them with XXX. The sed script also replaces carriage returns

Re: What's cooking in git.git (May 2017, #08; Mon, 29)

On Mon, May 29, 2017 at 8:23 AM, Junio C Hamano wrote: > * ab/pcre-v2 (2017-05-26) 7 commits > - grep: add support for PCRE v2 > - grep: un-break building with PCRE < 8.20 > - grep: un-break building with PCRE < 8.32 > - grep: add support for the PCRE v1 JIT API > - log: add -P as a synonym f

  1   2   >