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

2017-06-10 Thread Jeff King
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 replacement, retrying the packed store after > failing to find the objec

Re: [BUG?] gitlink without .gitmodules no longer fails recursive clone

2017-06-10 Thread Jeff King
On Sat, Jun 10, 2017 at 11:10:11AM +0900, Junio C Hamano wrote: > Jeff King writes: > > > In an ideal world the user do: > > > > git submodule add git://host/repo.git path > > > > which adds the gitlink and the .gitmodules entry. But it doesn't seem > > unreasonable for somebody unfamiliar wit

Re: [PATCH v2 1/2] git-compat-util: add a FREEZ() wrapper around free(ptr); ptr = NULL

2017-06-10 Thread Jeff King
On Sat, Jun 10, 2017 at 03:21:43AM +, Eric Wong wrote: > > So make Jonathan's freez_impl a public API and rename it to > > free_and_null(), perhaps? > > Perhaps... I think it needs to take "void *" to avoid warnings: > > static inline void free_and_null(void *ptrptr) > { >

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

2017-06-10 Thread Jeff King
On Fri, Jun 09, 2017 at 10:03:57AM -0700, Jonathan Nieder wrote: > Would putting a PULL_REQUEST_TEMPLATE and CONTRIBUTING in the > top-level directory work? If I'm reading > https://help.github.com/articles/setting-guidelines-for-repository-contributors/#adding-a-contributing-file > correctly the

Re: "There are too many unreachable loose objects" - why don't we run 'git prune' automatically?

2017-06-10 Thread Jeff King
On Fri, Jun 09, 2017 at 02:03:18PM +0200, Lars Schneider wrote: > > I agree the existing message isn't great. There should probably be a big > > advise() block explaining what's going on (and that expert users can > > disable). > > How about this? > > diff --git a/builtin/gc.c b/builtin/gc.c > i

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

2017-06-10 Thread Jeff King
On Wed, Jun 07, 2017 at 06:46:18PM -0400, Houston Fortney wrote: > I sometimes forget about something that I stashed. It would be nice if > the git status command would just say "There are x entries in the > stash." It can say nothing if there is nothing stashed so it is > usually not adding clutt

Re: [PATCH v2 1/8] discover_git_directory(): avoid setting invalid git_dir

2017-06-10 Thread Jeff King
On Thu, Jun 08, 2017 at 09:53:32PM +0200, Johannes Schindelin wrote: > When discovering a .git/ directory, we take pains to ensure that its > repository format version matches Git's expectations, and we return NULL > otherwise. > > However, we still appended the invalid path to the strbuf passed

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

2017-06-10 Thread Kaartic Sivaraam
On Sat, 2017-06-10 at 11:23 +0900, Junio C Hamano wrote: > $ git shortlog -20 --no-merges > > may help learning the preferred style of writing the title.  We do > not say "[I] did this".  Instead we phrase things in imperative > mood, giving an order to the codebase to "become like so".  E.g. This

[no subject]

2017-06-10 Thread Youichi Kanno
Sir/Madam I am sorry to encroach into your privacy in this manner, I found you listed in the Trade Center Chambers of Commerce directory here in Japan, My name is Youichi Kanno and I work in Audit & credit Supervisory role at The Norinchukin Bank, I need your assistance to process the

[PATCH v2 1/2] add setup step to filter-branch

2017-06-10 Thread Andreas Heiduk
A specific `--setup` step in `git filter-branch` makes it much easier to define the initial values of variables used in the real filters. Also sourcing/defining utility functions here instead of `--env-filter` improves performance and minimizes clogging the output in case of errors. Signed-off-by:

[PATCH v2 2/2] add [--] to usage of filter-branch

2017-06-10 Thread Andreas Heiduk
Signed-off-by: Andreas Heiduk --- git-filter-branch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 2758ae5eb..3a74602ef 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -87,7 +87,7 @@ USAGE="[--setup ] [--env

Re: [PATCH v2 2/8] config: report correct line number upon error

2017-06-10 Thread Jeff King
On Thu, Jun 08, 2017 at 09:53:35PM +0200, Johannes Schindelin wrote: > When get_value() parses a key/value pair, it is possible that the line > number is decreased (because the \n has been consumed already) before the > key/value pair is passed to the callback function, to allow for the > correct

Re: [PATCH v2 3/8] help: use early config when autocorrecting aliases

2017-06-10 Thread Jeff King
On Thu, Jun 08, 2017 at 09:53:38PM +0200, Johannes Schindelin wrote: > Git has this feature which suggests similar commands (including aliases) > in case the user specified an unknown command. > > This feature currently relies on a side effect of the way we expand > aliases right now: when a comm

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

2017-06-10 Thread Andreas Heiduk
When setting `.gitattributes` in a second worktree, a plain `rm .git/index` does not actually delete the index. Signed-off-by: Andreas Heiduk --- Documentation/gitattributes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/gitattributes.txt b/Documentation/gi

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

2017-06-10 Thread Kaartic Sivaraam
On Sat, 2017-06-10 at 14:14 +0530, Kaartic Sivaraam wrote: > Looks odd. Just to be more clear by "Looks odd" I mean that the new status message looks odd in the commit template. --  Regards, Kaartic Sivaraam

Re: [PATCH v2 4/8] read_early_config(): optionally return the worktree's top-level directory

2017-06-10 Thread Jeff King
On Thu, Jun 08, 2017 at 09:53:41PM +0200, Johannes Schindelin wrote: > So far, when we invoked the early config code path, we implicitly > determined the top-level directory of the worktree while discovering the > .git/ directory. > > And then we simply forgot that information. > > However, when

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

2017-06-10 Thread Jeff King
On Thu, Jun 08, 2017 at 09:53:53PM +0200, Johannes Schindelin wrote: > @@ -245,36 +201,37 @@ static int handle_options(const char ***argv, int > *argc, int *envchanged) > > static int handle_alias(int *argcp, const char ***argv) > { > + struct strbuf cdup_dir = STRBUF_INIT; > int en

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

2017-06-10 Thread Jeff King
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 squash patches 7 and 8 into thi

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

2017-06-10 Thread Samuel Lijin
On Sat, Jun 10, 2017 at 4:25 AM, Jeff King wrote: > On Wed, Jun 07, 2017 at 06:46:18PM -0400, Houston Fortney wrote: > >> I sometimes forget about something that I stashed. It would be nice if >> the git status command would just say "There are x entries in the >> stash." It can say nothing if the

Re: [PATCH v2 7/8] alias_lookup(): optionally return top-level directory

2017-06-10 Thread Jeff King
On Thu, Jun 08, 2017 at 09:53:50PM +0200, Johannes Schindelin wrote: > -char *alias_lookup(const char *alias) > [...] > { > - char *v = NULL; > - struct strbuf key = STRBUF_INIT; > - strbuf_addf(&key, "alias.%s", alias); > - if (git_config_key_is_valid(key.buf)) > - gi

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

2017-06-10 Thread Jeff King
On Sat, Jun 10, 2017 at 06:12:28AM -0400, Samuel Lijin wrote: > On Sat, Jun 10, 2017 at 4:25 AM, Jeff King wrote: > > On Wed, Jun 07, 2017 at 06:46:18PM -0400, Houston Fortney wrote: > > > >> I sometimes forget about something that I stashed. It would be nice if > >> the git status command would

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

2017-06-10 Thread Jeff King
On Sat, Jun 10, 2017 at 02:14:01PM +0530, Kaartic Sivaraam wrote: > > Does this break "git commit", or is the update limited to "git > > status"? > This does seem to be breaking 'git commit' as it seems to be using the > output of 'git status'. This change results in the following commit > templat

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

2017-06-10 Thread Junio C Hamano
Jeff King writes: > On Sat, Jun 10, 2017 at 02:14:01PM +0530, Kaartic Sivaraam wrote: > ... >> # Please enter the commit message for your changes. Lines starting >> # with '#' will be ignored, and an empty message aborts the commit. >> # On branch master >> # >> # Waiting for initial commit >> #

Re: [PATCH] pathspec: die on empty strings as pathspec

2017-06-10 Thread Junio C Hamano
Jeff King writes: > That's long enough for people who actually ran the intermediate > versions. But what about people on distros who jump from v2.10 or lower > straight to v2.14? > > I think to catch them we'd literally need years on our deprecation > schedules. Maybe it's not worth caring about

Re: [BUG?] gitlink without .gitmodules no longer fails recursive clone

2017-06-10 Thread Junio C Hamano
Jeff King writes: > Certainly I think it _could_ be a valid state. But traditionally it > caused "clone --recursive" to barf. And from what Stefan and Brandon > have said, we are moving in the opposite direction entirely, with > .gitmodules becoming the source of truth. > > I could see arguments

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

2017-06-10 Thread Junio C Hamano
Andreas Heiduk writes: > When setting `.gitattributes` in a second worktree, a plain `rm .git/index` > does not actually delete the index. > > Signed-off-by: Andreas Heiduk > --- > Documentation/gitattributes.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Right. I however have

Re: [PATCH] wildmatch test: cover a blind spot in "/" matching

2017-06-10 Thread Ævar Arnfjörð Bjarmason
On Sat, Jun 10 2017, Junio C. Hamano jotted: > Junio C Hamano writes: > >> Ævar Arnfjörð Bjarmason writes: >> >>> Add a test which covers a blindspot in how these tests should assert >>> that negated character classes are allowed or not allowed to match "/" >>> in certain circumstances. >> >>

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

2017-06-10 Thread SZEDER Gábor
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, 2011-05-18) without explanation, though the code using it still expec

Re: 'pu' broken at t5304 tonight

2017-06-10 Thread Kevin Daudt
On Sat, Jun 10, 2017 at 03:07:01PM +0900, Junio C Hamano wrote: > I didn't check where it goes wrong. Here is a list of suspects, > taken by > > $ git shortlog --no-merges pu@{8.hours}..pu > > i.e. patches that weren't in pu before today's integration cycle. > > Andreas Heiduk (1): >

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

2017-06-10 Thread Philip Oakley
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) contributors and consequently they create

Re: git push recurse.submodules behavior changed in 2.13

2017-06-10 Thread John Shahid
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. On Wed, May 31, 2017 at 10:50 AM, John Shahid wrote: > Hi Jonathan. Thanks a lot for the detailed and interesting response. I > included my comments/replie

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

2017-06-10 Thread Ben Peart
Add a test utility (test-drop-caches) that enables dropping the file system cache on Windows. Add a perf test (p7519-fsmonitor.sh) for fsmonitor. Signed-off-by: Ben Peart Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile| 1 + t/helper/test-drop-caches.c | 107 +

[PATCH v5 6/7] fsmonitor: add a sample query-fsmonitor hook script for Watchman

2017-06-10 Thread Ben Peart
This hook script integrates the new fsmonitor capabilities of git with the cross platform Watchman file watching service. To use the script: Download and install Watchman from https://facebook.github.io/watchman/ and instruct Watchman to watch your working directory for changes ('watchman watch-pr

[PATCH v5 2/7] dir: make lookup_untracked() available outside of dir.c

2017-06-10 Thread Ben Peart
Remove the static qualifier from lookup_untracked() and make it available to other modules by exporting it from dir.h. This will be used later when we need to find entries to mark 'fsmonitor dirty.' Signed-off-by: Ben Peart --- dir.c | 2 +- dir.h | 3 +++ 2 files changed, 4 insertions(+), 1 de

[PATCH v5 4/7] fsmonitor: add test cases for fsmonitor extension

2017-06-10 Thread Ben Peart
Add test cases that ensure status results are correct when using the new fsmonitor extension. Test untracked, modified, and new files by ensuring the results are identical to when not using the extension. Add a test to ensure updates to the index properly mark corresponding entries in the index e

[PATCH v5 3/7] fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files.

2017-06-10 Thread Ben Peart
When the index is read from disk, the query-fsmonitor index extension is used to flag the last known potentially dirty index and untracked cache entries. If git finds out some entries are 'fsmonitor-dirty', but are really unchanged (e.g. the file was changed, then reverted back), then Git will cle

[PATCH v5 1/7] bswap: add 64 bit endianness helper get_be64

2017-06-10 Thread Ben Peart
Add a new get_be64 macro to enable 64 bit endian conversions on memory that may or may not be aligned. Signed-off-by: Ben Peart --- compat/bswap.h | 4 1 file changed, 4 insertions(+) diff --git a/compat/bswap.h b/compat/bswap.h index d47c003544..f89fe7f4b5 100644 --- a/compat/bswap.h +++

[PATCH v5 0/7] Fast git status via a file system watcher

2017-06-10 Thread Ben Peart
Changes from V4 include: fsmonitor.c: Only flag index dirty if fsmonitor extension is added or removed or if new cache or untracked cache entries are marked dirty dir.c: If an untracked cache entry is flagged as fsmonitor_dirty, fall back to existing logic to stat

[PATCH v5 5/7] fsmonitor: add documentation for the fsmonitor extension.

2017-06-10 Thread Ben Peart
This includes the core.fsmonitor setting, the query-fsmonitor hook, and the fsmonitor index extension. Signed-off-by: Ben Peart --- Documentation/config.txt | 7 +++ Documentation/githooks.txt | 23 +++ Documentation/technical/index-format.t

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

2017-06-10 Thread Ben Peart
Here are some perf test results for repos of various size generated with many-files.sh. Comparing cold fs cache times on a fast SSD running Windows: # files preloadindexfsmonitor reduction = 10,000 0.69

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

2017-06-10 Thread Philip Oakley
From: "Kaartic Sivaraam" On Sat, 2017-06-10 at 11:23 +0900, Junio C Hamano wrote: $ git shortlog -20 --no-merges may help learning the preferred style of writing the title. We do not say "[I] did this". Instead we phrase things in imperative mood, giving an order to the codebase to "become lik

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

2017-06-10 Thread Andreas Heiduk
Am 10.06.2017 um 13:17 schrieb Junio C Hamano: > Andreas Heiduk writes: > >> When setting `.gitattributes` in a second worktree, a plain `rm .git/index` >> does not actually delete the index. >> [...] > Right. > > I however have to wonder if we can do the same without futzing > directly with t

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

2017-06-10 Thread Andreas Heiduk
When setting `.gitattributes` in a second worktree, a plain `rm .git/index` does not actually delete the index. Signed-off-by: Andreas Heiduk Helped-by: Junio C Hamano --- Documentation/gitattributes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/gitattrib

Re: 'pu' broken at t5304 tonight

2017-06-10 Thread Kevin Daudt
On Sat, Jun 10, 2017 at 02:48:36PM +0200, Kevin Daudt wrote: > On Sat, Jun 10, 2017 at 03:07:01PM +0900, Junio C Hamano wrote: > > I didn't check where it goes wrong. Here is a list of suspects, > > taken by > > > > $ git shortlog --no-merges pu@{8.hours}..pu > > > > i.e. patches that weren'

Hope you got my previous messages

2017-06-10 Thread Qatif Group of Companies
-- Dear Friend, I would like to discuss a very important issue with you. I am writing to find out if this is your valid email. Please, let me know if this email is valid Kind regards Adrien Saif Attorney to Qatif Group of Companies

Good day I write to you in hope that you will be open minded to consider a business partnership proposal in transaction deal worth millions. All I require from you is honesty and an assurance that you

2017-06-10 Thread Ben Moore

Re: [PATCH v2 00/32] repository object

2017-06-10 Thread Brandon Williams
On 06/10, 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" will end up growing without > > bounds as we store more and more repo-specific concerns in it.

Re: [PATCH v2 00/32] repository object

2017-06-10 Thread Brandon Williams
On 06/10, Jeff King wrote: > On Sat, Jun 10, 2017 at 02:07:12AM -0400, Jeff King wrote: > > > I think the repository object has to become a kitchen sink of sorts, > > because we have tons of global variables representing repo-wide config. > > ls-files doesn't respect a lot of config, but what shou

Re: 'pu' broken at t5304 tonight

2017-06-10 Thread Christian Couder
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 the parent of the merge break this test, so it loo

PLEASE I NEED YOUR HELP

2017-06-10 Thread Miss Mariame
Hello Dear, I'm Miss.Mariame 24yrs old female, from Benghazi – Libya seeking for your assistance regards to my situation since the death of my parents.My father of blessed memory by name late General Abdel Fattah Younes who was shot death by Islamist-linked militia within the anti-Gaddafi forces