Re: [PATCH 2/2] Added test cases for git reset -

Hi, On Sun, Mar 08, 2015 at 08:28:40PM +0530, Sudhanshu Shekhar wrote: Four test cases have been added 1) when user does reset - without any previous branch = Leads to error 2) when user does reset - with a previous branch = Ensure it behaves like at {-1} Other two deal with the

Re: [PATCH v2/GSoC/MICRO] revision: forbid combining --graph and --no-walk

Dongcan Jiang dongcan.ji...@gmail.com writes: Because --graph is about connected history while --no-walk is about discrete points. [1] The convention around here is that the title of the patch on the Subject line is *not* the beginning part of the first sentence, you would need to phrase the

Re: [PATCH] t7510: do not fail when gpg warns about insecure memory

On Sun, Mar 8, 2015 at 11:40 AM, Kyle J. McKay mack...@gmail.com wrote: Depending on how gpg was built, it may issue the following message to stderr when run: Warning: using insecure memory! Unfortunately when running the test, that message gets collected in the stdout result of git show

Re: Git very slow ?

On Sun, Mar 08, 2015 at 05:21:22PM +0100, David Kastrup wrote: Kevin D m...@ikke.info writes: On Sat, Mar 07, 2015 at 01:30:07AM +, Ken Moffat wrote: Hi, please CC me if that is not your usual fashion, because I am not subscribed. I use git for my build scripts - those are

Re: [PATCH] t5528: do not fail with FreeBSD shell

On Sun, Mar 08, 2015 at 08:37:50AM -0700, Kyle J. McKay wrote: The FreeBSD shell converts this expression: git ${1:+-c push.default=$1} push to this when $1 is not empty: git -c push.default=$1 push which causes git to fail. Hmph, just when I thought I knew about all of the

Re: Git very slow ?

On Sun, Mar 08, 2015 at 04:51:36PM +0100, Kevin D wrote: On Sat, Mar 07, 2015 at 01:30:07AM +, Ken Moffat wrote: Hi, please CC me if that is not your usual fashion, because I am not subscribed. I use git for my build scripts - those are accessed over nfs. Since I started using 2.1

Re: Git very slow ?

On Sun, Mar 8, 2015 at 12:37 PM, David Kastrup d...@gnu.org wrote: Since git blame outputs everything once it is finished (the first screen is purely the pager's business), it needs to unpack the entire history of the file (unless no blameable lines remain at all) and look at it. 6 seconds

Re: Please consider adding a -f switch to git-clone (or something similar)

Kyle, Thanks, I suppose that works well enough for my needs. I wasn't aware that aliases were that flexible in git. I also have no problem to git-init and do all the other steps manually. Thanks, Diego On Sat, Mar 7, 2015 at 11:32 PM, Kyle J. McKay mack...@gmail.com wrote: On Mar 7, 2015, at

Re: [PATCH v3 2/3] sha1_file: implement changes for cat-file --literally -t

karthik nayak karthik@gmail.com writes: Sorry for the confusion, you did already say that in $gmane/264955 , I'm talking about how I tackled the issue in $gmane/264855. Well, I am suggesting how to improve what you did in your $gmane/264855 and a part of that was to suggest that teaching

Re: Git very slow ?

Ken Moffat zarniwh...@ntlworld.com writes: On Sun, Mar 08, 2015 at 05:21:22PM +0100, David Kastrup wrote: Particularly not git-blame in 2.1. I should be quite surprised to see any git-blame call running noticeably slower in 2.1 than in any preceding version. What may have happened is

Re: Git very slow ?

On Sun, Mar 8, 2015 at 12:02 PM, Ken Moffat zarniwh...@ntlworld.com wrote: The comments on git bisect were for linus'skernel tree, on a local disk. 2.3GB of repo, just under 57000 files. Ugh. I hope you are talking about checked-out size. [torvalds@i7 linux]$ du -sh .git 850M .git

Re: [PATCH] protocol upload-pack-v2

Stefan Beller sbel...@google.com writes: I do not see a good reason why we want I am sending N caps upfront, instead of this, that, and here is the end of the group. I thought about having an end marker, so something like capabilities start thin-pack lang ofs-delta capabilities done

Re: Efficient parsing of `status -z` output

Matthew Rothenberg mrothenb...@gmail.com writes: 2. Read from buffer until the first NUL, parse the entry status codes, and if the entry status code represents a status that *should* have multiple filenames, read from buffer until a second NUL is found, and then reparse that entry with both

Re: [PATCH v3 2/3] sha1_file: implement changes for cat-file --literally -t

On 03/08/2015 01:39 PM, Junio C Hamano wrote: karthik nayak karthik@gmail.com writes: On 03/07/2015 12:58 AM, Junio C Hamano wrote: case 't': oi.typep = type; oi.typename = sb; sha1_object_info_extended(sha1, oi, flags); if (sb.len) {

Re: [GSoC/RFC] Ideas on git fetch --deepen

Hi, all After digging into how git fetch works, I have found that my previous understanding was too rash. I'm sorry for that. I find that the current workflow of git fetch --depth is as follows: 1. 'fetch module' calls 'git-upload-pack service' via 'transport module' to fetch ref with

Re: [PATCH] Suggest applicants to participate in review of other peoples' patches

Junio C Hamano gits...@pobox.com writes: Jeff King p...@peff.net writes: On Fri, Mar 06, 2015 at 12:53:57PM +0100, Matthieu Moy wrote: Idea and most of the wording comes from Junio's message on the list. I added a hint to include links to review in the application (which makes the

Re: [GSoC/RFC] Ideas on git fetch --deepen

It is really helpful. Thanks a lot! 2015-03-08 17:34 GMT+08:00 Duy Nguyen pclo...@gmail.com: On Sun, Mar 8, 2015 at 3:57 PM, Dongcan Jiang dongcan.ji...@gmail.com wrote: Hi, all After digging into how git fetch works, I have found that my previous understanding was too rash. I'm sorry for

[PATCH 23/24] untracked cache: guard and disable on system changes

If the user enables untracked cache, then - move worktree to an unsupported filesystem - or simply upgrade OS - or move the whole (portable) disk from one machine to another - or access a shared fs from another machine there's no guarantee that untracked cache can still function properly.

[PATCH 22/24] mingw32: add uname()

Helped-by: Eric Sunshine sunsh...@sunshineco.com Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- compat/mingw.c | 11 +++ compat/mingw.h | 9 + 2 files changed, 20 insertions(+) diff --git a/compat/mingw.c

Re: [PATCH v4] git: treat -C treat as a no-op when path is empty

On 03/08/2015 12:44 PM, Junio C Hamano wrote: Eric Sunshine sunsh...@sunshineco.com writes: On Sat, Mar 7, 2015 at 5:49 AM, karthik nayak karthik@gmail.com wrote: Also *(*argv)[1] seems more readable to me, maybe more of a perspective? I also had considered suggesting (*argv)[1][0]

[PATCH 21/24] t7063: tests for untracked cache

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- .gitignore | 1 + Makefile | 1 + t/t7063-status-untracked-cache.sh (new +x) | 353 +

[PATCH 24/24] git-status.txt: advertisement for untracked cache

When a good user sees the too long, consider -uno advice when running `git status`, they should check out the man page to find out more. This change suggests they try untracked cache before -uno. Helped-by: brian m. carlson sand...@crustytoothpaste.net Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH 20/24] update-index: test the system before enabling untracked cache

Helped-by: Eric Sunshine sunsh...@sunshineco.com Helped-by: Junio C Hamano gits...@pobox.com Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/git-update-index.txt | 6 ++ builtin/update-index.c | 168

Re: Is the Git Mailing List dropping messages?

Kyle J. McKay mack...@gmail.com writes: About 10 days ago I sent out this message (just reproducing the relevant headers here): From: Kyle J. McKay mack...@gmail.com Date: February 24, 2015 09:16:05 PST To: Junio C Hamano gits...@pobox.com Cc: Git Mailing List git@vger.kernel.org Subject:

Re: [GSoC/RFC] Ideas on git fetch --deepen

On Sun, Mar 8, 2015 at 3:57 PM, Dongcan Jiang dongcan.ji...@gmail.com wrote: Hi, all After digging into how git fetch works, I have found that my previous understanding was too rash. I'm sorry for that. I find that the current workflow of git fetch --depth is as follows: 1. 'fetch

[PATCH 08/24] untracked cache: don't open non-existent .gitignore

This cuts down a signficant number of open(.gitignore) because most directories usually don't have .gitignore files. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- dir.c | 26 +- 1 file changed, 25 insertions(+),

[PATCH 02/24] untracked cache: record .gitignore information and dir hierarchy

The idea is if we can capture all input and (non-rescursive) output of read_directory_recursive(), and can verify later that all the input is the same, then the second r_d_r() should produce the same output as in the first run. The requirement for this to work is stat info of a directory MUST

[PATCH 18/24] status: enable untracked cache

update_index_if_able() is moved down so that the updated untracked cache could be written out. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- builtin/commit.c | 5 +++-- wt-status.c | 2 ++ 2 files changed, 5 insertions(+), 2

[PATCH 15/24] untracked cache: print stats with $GIT_TRACE_UNTRACKED_STATS

This could be used to verify correct behavior in tests Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- dir.c | 12 1 file changed, 12 insertions(+) diff --git a/dir.c b/dir.c index 7d57623..01f0032 100644 --- a/dir.c +++

[PATCH 16/24] untracked cache: mark index dirty if untracked cache is updated

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- cache.h | 1 + dir.c| 9 + read-cache.c | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/cache.h b/cache.h index f8b3dc5..fca979b 100644 ---

[PATCH 17/24] untracked-cache: temporarily disable with $GIT_DISABLE_UNTRACKED_CACHE

This can be used to double check if results with untracked cache are correctly, compared to vanilla version. Untracked cache remains in index, but not used. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- dir.c | 2 +- 1 file changed, 1

[PATCH 10/24] untracked cache: save to an index extension

Helped-by: Stefan Beller sbel...@google.com Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/technical/index-format.txt | 58 + cache.h | 3 + dir.c

[PATCH 11/24] untracked cache: load from UNTR index extension

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- dir.c| 219 +++ dir.h| 2 + read-cache.c | 5 ++ 3 files changed, 226 insertions(+) diff --git a/dir.c b/dir.c index 8f0deb1..0b37c65 100644 --- a/dir.c +++

[PATCH 19/24] update-index: manually enable or disable untracked cache

Overall time saving on git status is about 40% in the best case scenario, removing ..collect_untracked() as the most time consuming function. read and refresh index operations are now at the top (which should drop when index-helper and/or watchman support is added). More numbers and analysis

[PATCH 12/24] untracked cache: invalidate at index addition or removal

Ideally we should implement untracked_cache_remove_from_index() and untracked_cache_add_to_index() so that they update untracked cache right away instead of invalidating it and wait for read_directory() next time to deal with it. But that may need some more work in unpack-trees.c. So stay simple

[PATCH 14/24] untracked cache: avoid racy timestamps

When a directory is updated within the same second that its timestamp is last saved, we cannot realize the directory has been updated by checking timestamps. Assume the worst (something is update). See 29e4d36 (Racy GIT - 2005-12-20) for more information. Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH 13/24] read-cache.c: split racy stat test to a separate function

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- read-cache.c | 24 +++- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/read-cache.c b/read-cache.c index d643a3f..f12a185 100644 --- a/read-cache.c +++

[PATCH 09/24] ewah: add convenient wrapper ewah_serialize_strbuf()

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- ewah/ewah_io.c | 13 + ewah/ewok.h| 2 ++ split-index.c | 11 ++- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ewah/ewah_io.c b/ewah/ewah_io.c

Re: [PATCH][GSoC] revision: forbid --graph and --no-walk usage

Akshay Aurora akshayaurora2...@gmail.com writes: Thanks Junio. Working on v2 for this patch. On Sat, Mar 7, 2015 at 12:00 AM, Junio C Hamano gits...@pobox.com wrote: Please, don't top-post on this list. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send

Re: [PATCH] rev-list: refuse --first-parent combined with --bisect

Kevin Daudt m...@ikke.info writes: On Sat, Mar 07, 2015 at 10:31:16PM +0100, Kevin Daudt wrote: diff --git a/builtin/rev-list.c b/builtin/rev-list.c index ff84a82..c271e15 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -291,6 +291,9 @@ int cmd_rev_list(int argc, const char

Re: [PATCH] xmerge.c: fix xdl_merge to conform with the manual

Anton Trunov anton.a.tru...@gmail.com writes: On 04/03/15 23:01, Junio C Hamano wrote: My apologies for pushing this topic, but what would you recommend? Should we treat both sides line-wise or should we correct the documentation? My gut feeling is that the change to swap which side is

Re: [PATCH v3 2/3] sha1_file: implement changes for cat-file --literally -t

karthik nayak karthik@gmail.com writes: On 03/07/2015 12:58 AM, Junio C Hamano wrote: case 't': oi.typep = type; oi.typename = sb; sha1_object_info_extended(sha1, oi, flags); if (sb.len) { printf(%s\n, sb.buf); strbuf_release(sb);

Re: [PATCH v3 2/3] sha1_file: implement changes for cat-file --literally -t

karthik nayak karthik@gmail.com writes: What parse_sha1_header() does to get the type is just find the first occurrence of a manually and store everything before it as the type. Then it finds the size of the object if needed. And finally returns the type by calling type_from_string().

Re: [PATCH v2 02/10] Define utility functions for object IDs.

On Sun, Mar 8, 2015 at 6:23 AM, brian m. carlson sand...@crustytoothpaste.net wrote: There are several utility functions (hashcmp and friends) that are used for comparing object IDs (SHA-1 values). Using these functions, which take pointers to unsigned char, with struct object_id requires

[PATCH 06/24] untracked cache: record/validate dir mtime and reuse cached output

The main readdir loop in read_directory_recursive() is replaced with a new one that checks if cached results of a directory is still valid. If a file is added or removed from the index, the containing directory is invalidated (but not its subdirs). If directory's mtime is changed, the same

[PATCH 03/24] untracked cache: initial untracked cache validation

Make sure the starting conditions and all global exclude files are good to go. If not, either disable untracked cache completely, or wipe out the cache and start fresh. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- dir.c | 113

[PATCH 04/24] untracked cache: invalidate dirs recursively if .gitignore changes

It's easy to see that if an existing .gitignore changes, its SHA-1 would be different and invalidate_gitignore() is called. If .gitignore is removed, add_excludes() will treat it like an empty .gitignore, which again should invalidate the cached directory data. if .gitignore is added,

[PATCH 07/24] untracked cache: mark what dirs should be recursed/saved

If we redo this thing in a functional style, we would have one struct untracked_dir as input tree and another as output. The input is used for verification. The output is a brand new tree, reflecting current worktree. But that means recreate a lot of dir nodes even if a lot could be shared

[PATCH 01/24] dir.c: optionally compute sha-1 of a .gitignore file

This is not used anywhere yet. But the goal is to compare quickly if a .gitignore file has changed when we have the SHA-1 of both old (cached somewhere) and new (from index or a tree) versions. Helped-by: Junio C Hamano gits...@pobox.com Helped-by: Torsten Bögershausen tbo...@web.de

[PATCH 05/24] untracked cache: make a wrapper around {open,read,close}dir()

This allows us to feed different info to read_directory_recursive() based on untracked cache in the next patch. Helped-by: Ramsay Jones ram...@ramsay1.demon.co.uk Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- dir.c | 55

[PATCH 00/24] nd/untracked-cache updates

Compared to 'pu', this fixes two bugs (in 01/24 and 10/24) and one style vololation (in 11/24), found by Junio and Stefan. Diff -- 8 -- diff --git a/dir.c b/dir.c index b8a4f9e..8a037ee 100644 --- a/dir.c +++ b/dir.c @@ -687,7 +687,8 @@ static int add_excludes(const char *fname, const char

Re: [PATCH] [GSoC Microproject]Adding - shorthand for @{-1} in RESET command

Sundararajan R dyou...@gmail.com writes: I am sorry for the mistakes in the code formatting. It was because I was in a hurry that day and I wanted to submit a working patch. No need to apologize for mistakes. Mistakes are expected part of being human and the review process is designed to

Re: [PATCH] t7510: do not fail when gpg warns about insecure memory

On Sun, Mar 8, 2015 at 6:04 PM, brian m. carlson sand...@crustytoothpaste.net wrote: On Sun, Mar 08, 2015 at 05:43:41PM -0400, Eric Sunshine wrote: On Sun, Mar 8, 2015 at 11:40 AM, Kyle J. McKay mack...@gmail.com wrote: Warning: using insecure memory! Unfortunately when running the test,

Re: [PATCH v3 1/3] cache: modify for cat-file --literally -t

On Thu, Mar 5, 2015 at 1:18 PM, Karthik Nayak karthik@gmail.com wrote: cache: modify for cat-file --literally -t It is desirable for the first line of the commit message to explain, as well as possible, the intent of the patch. The bulk of the commit message then elaborates. Unfortunately,

Re: [GSoC][PATCH 1/2] userdiff: add built-in patterns for CSS

On Sun, Mar 8, 2015 at 7:03 AM, Hiroyuki Sano sh19910...@gmail.com wrote: Add regex patterns for CSS. The word regex maches selectors, properties, and values. On the other hand, the funcname regex matches lines contains the curly brace character. Signed-off-by: Hiroyuki Sano

Re: [PATCH] versionsort: support reorder prerelease suffixes

On Thu, Mar 5, 2015 at 8:28 AM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano gits...@pobox.com writes: +versionsort.prereleaseSuffix:: +When version sort is used in linkgit:git-tag[1], prerelease +tags (e.g. 1.0-rc1) may appear after the main release +1.0. By specifying

Re: [PATCH] t7510: do not fail when gpg warns about insecure memory

On Sun, Mar 08, 2015 at 06:15:55PM -0400, Eric Sunshine wrote: On Sun, Mar 8, 2015 at 6:04 PM, brian m. carlson sand...@crustytoothpaste.net wrote: Perhaps this is better? Unfortunately when running the test, that message is found in the standard output of git show -s --show-signature, but

Re: [PATCH v3] rev-list: refuse --first-parent combined with --bisect

On Sun, Mar 8, 2015 at 11:03 AM, Kevin Daudt m...@ikke.info wrote: rev-list --bisect is used by git bisect, but never together with --first-parent. Because rev-list --bisect together with --first-parent is not handled currently, and even leads to segfaults, refuse to use both options together.

Re: Efficient parsing of `status -z` output

On Sun, Mar 8, 2015 at 4:14 AM, Junio C Hamano gits...@pobox.com wrote: I think this is how -z was designed to be used, and if that isn't clear, then the documentation must be updated to clarify. Rename and Copy are the only ones that needs two pathnames, and I suspect that whoever did the

Re: [GSoC][PATCH 2/2] attrs: add css to the list of userdiff bulit-in patterns

On Sun, Mar 8, 2015 at 7:03 AM, Hiroyuki Sano sh19910...@gmail.com wrote: attrs: add css to the list of userdiff bulit-in patterns s/bulit/built/ Signed-off-by: Hiroyuki Sano sh19910...@gmail.com --- diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index

Re: Git very slow ?

On Sun, Mar 08, 2015 at 12:39:10PM -0700, Linus Torvalds wrote: On Sun, Mar 8, 2015 at 12:02 PM, Ken Moffat zarniwh...@ntlworld.com wrote: The comments on git bisect were for linus'skernel tree, on a local disk. 2.3GB of repo, just under 57000 files. Ugh. I hope you are talking about

[PATCH] Add --recursive flag to git bash completion script.

This is a patch to add a much needed option to the bash completion script. I'm not subscribed to this list, so please include me in your reply if you'd like me to see your response. Thanks, James From ca976de5bfeccc9bd69c22183f82b9d1e59d2547 Mon Sep 17 00:00:00 2001 From: James Shubin

Re: [PATCH] t7510: do not fail when gpg warns about insecure memory

On Mar 8, 2015, at 18:22, brian m. carlson wrote: On Sun, Mar 08, 2015 at 06:15:55PM -0400, Eric Sunshine wrote: On Sun, Mar 8, 2015 at 6:04 PM, brian m. carlson sand...@crustytoothpaste.net wrote: Perhaps this is better? Unfortunately when running the test, that message is found in the

[PATCH v3/GSoC/MICRO] revision: forbid combining --graph and --no-walk

Because --graph is about connected history while --no-walk is about discrete points, it does not make sense to allow giving these two options at the same time. [1] This change allows git-show to have such options' combination as a special case, because git-show itself has underlying --no-walk

Re: [PATCH] t5528: do not fail with FreeBSD shell

On Mar 8, 2015, at 10:56, Jeff King wrote: On Sun, Mar 08, 2015 at 08:37:50AM -0700, Kyle J. McKay wrote: The FreeBSD shell converts this expression: git ${1:+-c push.default=$1} push to this when $1 is not empty: git -c push.default=$1 push which causes git to fail. Hmph, just when I

Re: [PATCH 1/2] reset: allow - short hand for previous commit

Sudhanshu Shekhar sudshekha...@gmail.com writes: + if(!strcmp(argv[0], -)) { [...] diff --git a/builtin/reset.c b/builtin/reset.c index 9f8967d..02f33ef 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -206,7 +206,7 @@ static void parse_args(struct pathspec *pathspec,

Re: [PATCH v3 2/3] sha1_file: implement changes for cat-file --literally -t

On 03/08/2015 02:33 PM, Junio C Hamano wrote: karthik nayak karthik@gmail.com writes: What parse_sha1_header() does to get the type is just find the first occurrence of a manually and store everything before it as the type. Then it finds the size of the object if needed. And finally

Re: [PATCH] [GSoC Microproject]Adding - shorthand for @{-1} in RESET command

On Sun, Mar 8, 2015 at 1:04 PM Junio C Hamano gits...@pobox.com wrote: Sundararajan R dyou...@gmail.com writes: diff --git a/builtin/reset.c b/builtin/reset.c index 4c08ddc..62764d4 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -203,8 +203,16 @@ static void parse_args(struct pathspec

[GSoC][PATCH 1/2] userdiff: add built-in patterns for CSS

Add regex patterns for CSS. The word regex maches selectors, properties, and values. On the other hand, the funcname regex matches lines contains the curly brace character. Signed-off-by: Hiroyuki Sano sh19910...@gmail.com --- t/t4018-diff-funcname.sh | 1 + t/t4034-diff-words.sh| 1 +

[GSoC][PATCH 2/2] attrs: add css to the list of userdiff bulit-in patterns

Signed-off-by: Hiroyuki Sano sh19910...@gmail.com --- Documentation/gitattributes.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index c892ffa..8904a2a 100644 --- a/Documentation/gitattributes.txt +++

Re: [PATCH] t7510: do not fail when gpg warns about insecure memory

On Sun, Mar 08, 2015 at 05:43:41PM -0400, Eric Sunshine wrote: On Sun, Mar 8, 2015 at 11:40 AM, Kyle J. McKay mack...@gmail.com wrote: Depending on how gpg was built, it may issue the following message to stderr when run: Warning: using insecure memory! Unfortunately when running the test,

Re: [PATCH v3 3/3] cat-file: add --literally option

On Thu, Mar 5, 2015 at 1:19 PM, Karthik Nayak karthik@gmail.com wrote: made changes to cat-file to include a --literally Write in imperative mood: Teach cat-file a --literally option... option which prints the type of the object without any complaints. Unfortunately, this explanation is

[PATCH 1/2] Teach reset the same short-hand as checkout

- now means the previous branch. Signed-off-by: Sudhanshu Shekhar sudshekha...@gmail.com Thanks-to: Junio C Hamano, Matthieu Moy, Eric Sunshine --- Thank you all for your feedback. Please let me know if I am missing out on anything else. builtin/reset.c | 9 - 1 file changed, 8

[PATCH 2/2] Added test cases for git reset -

Four test cases have been added 1) when user does reset - without any previous branch = Leads to error 2) when user does reset - with a previous branch = Ensure it behaves like at {-1} Other two deal with the situation when we have a file named '-'. We ignore such a file and - is always

[PATCH v3] rev-list: refuse --first-parent combined with --bisect

rev-list --bisect is used by git bisect, but never together with --first-parent. Because rev-list --bisect together with --first-parent is not handled currently, and even leads to segfaults, refuse to use both options together. Signed-off-by: Kevin Daudt m...@ikke.info Suggested-by: Junio C.

[PATCH v3] rev-list: refuse --first-parent combined with --bisect

rev-list --bisect is used by git bisect, but never together with --first-parent. Because rev-list --bisect together with --first-parent is not handled currently, and even leads to segfaults, refuse to use both options together. Signed-off-by: Kevin Daudt m...@ikke.info Suggested-by: Junio C.

Re: Git very slow ?

On Sat, Mar 07, 2015 at 01:30:07AM +, Ken Moffat wrote: Hi, please CC me if that is not your usual fashion, because I am not subscribed. I use git for my build scripts - those are accessed over nfs. Since I started using 2.1 and later (I don't think I used 2.0) commands such as

Your Payment Attached

PAYMENT INFO.pdf Description: Binary data

Re: Git very slow ?

Kevin D m...@ikke.info writes: On Sat, Mar 07, 2015 at 01:30:07AM +, Ken Moffat wrote: Hi, please CC me if that is not your usual fashion, because I am not subscribed. I use git for my build scripts - those are accessed over nfs. Since I started using 2.1 and later (I don't think I

[PATCH] t7510: do not fail when gpg warns about insecure memory

Depending on how gpg was built, it may issue the following message to stderr when run: Warning: using insecure memory! Unfortunately when running the test, that message gets collected in the stdout result of git show -s --show-signature but is collected in the stderr result of git

[PATCH v2] rev-list: refuse --first-parent combined with --bisect

rev-list --bisect is used by git bisect, but never together with --first-parent. Because rev-list --bisect together with --first-parent is not handled currently, and even leads to segfaults, refuse to use both options together. Signed-off-by: Kevin Daudt m...@ikke.info Suggested-by: Junio C.

Re: [PATCH v2 02/10] Define utility functions for object IDs.

On Sun, Mar 08, 2015 at 04:57:36PM +0700, Duy Nguyen wrote: On Sun, Mar 8, 2015 at 6:23 AM, brian m. carlson sand...@crustytoothpaste.net wrote: I'm not very excited about having to put the #include in the middle of cache.h. The alternative, of course, is to move enum object_type up, which I

[PATCH] t5528: do not fail with FreeBSD shell

The FreeBSD shell converts this expression: git ${1:+-c push.default=$1} push to this when $1 is not empty: git -c push.default=$1 push which causes git to fail. To avoid this we simply break up the expansion into two parts so that the whitespace which creates two arguments instead of one