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

2015-03-09 Thread Eric Sunshine
On Mon, Mar 9, 2015 at 4:46 PM, Sundararajan R wrote: > Please give feedback and suggest things I may have missed out on. > I hope I have incorporated all the suggestions. If you haven't already, read Documentation/SubmittingPatches. Pay particular attention to section #2 which explains how to wr

Re: [PATCH 07/16] list-files: show directories as well as files

2015-03-09 Thread Duy Nguyen
On Tue, Mar 10, 2015 at 1:23 PM, Eric Sunshine wrote: >> +static int add_directory(struct string_list *result, >> +const char *name) >> +{ >> + struct strbuf sb = STRBUF_INIT; >> + const char *p; >> + >> + strbuf_add(&sb, name, strlen(name)); > > strbuf_ad

Re: [PATCH 15/16] list-files: delete redundant cached entries

2015-03-09 Thread Eric Sunshine
On Monday, March 9, 2015, Nguyễn Thái Ngọc Duy wrote: > When both --cached and one of -amdAMD is used together we may have two > entries of the same path, e.g. " foo" and "MM foo". In this case it's > pretty clear that "foo" must be tracked, no need to display " foo". > The new function does th

Re: [PATCH 07/16] list-files: show directories as well as files

2015-03-09 Thread Eric Sunshine
On Monday, March 9, 2015, Nguyễn Thái Ngọc Duy wrote: > The index does not store directories explicitly (except submodules) so > we have to figure them out from file list when output lis depth-limited. s/lis/is/ > The function add_directory() can generate duplicate entries, which is > cleaned up

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

2015-03-09 Thread Torsten Bögershausen
On 03/09/2015 09:46 PM, Sundararajan R wrote: As you had suggested @Junio, I have added the required tests. Please let me know if there is something is I should add. Signed-off-by: Sundararajan R Thanks-to: Junio C Hamano --- I have added 6 tests to check for the following cases: git reset - wi

Re: Efficient parsing of `status -z` output

2015-03-09 Thread Jeff King
On Mon, Mar 09, 2015 at 07:40:43PM -0400, Matthew Rothenberg wrote: > On Mon, Mar 9, 2015 at 2:49 AM, Jeff King wrote: > > $ git init > > $ seq 1 1000 >file && git add file && git commit -m base > > $ mv file other > > $ echo foo >file > > $ git add . > > $ git status --short > > M

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

2015-03-09 Thread Junio C Hamano
Sudhanshu Shekhar writes: > "-" now means the previous branch. > > Signed-off-by: Sudhanshu Shekhar > Thanks-to: Eric Sunshine, Junio C Hamano, Matthieu Moy > --- These look unusual for a few reasons: your S-o-b should be at the end, we usually say Helped-by: instead, and we do not use these w

Re: [PATCH 2/2] help.c: use SHELL_PATH instead of hard-coded "/bin/sh"

2015-03-09 Thread Junio C Hamano
Jeff King writes: > However, that is _not_ what we currently do with run-command's > use_shell directive. There we put SHELL_PATH as argv[0], and run: > > execv(argv[0], argv); > ... > If we want to maintain consistency with the rest of our uses of > run-command, it would be just your original:

Re: [PATCH] log: decorate detached HEAD differently

2015-03-09 Thread Junio C Hamano
Michael J Gruber writes: > Junio C Hamano venit, vidit, dixit 06.03.2015 20:03: >> Michael J Gruber writes: >>> >>> Note that now a checked branch is listed twice, once as target of the >>> HEAD, once as branch: They are two different refs and colored >>> differently. >> >> The po

Re: [PATCH] protocol upload-pack-v2

2015-03-09 Thread Duy Nguyen
A minor point on capability negotiation. I remember why I passed capabilities via command line instead of this proposal. With this proposal, daemon.c does not recognize "i18n" capability and cannot switch to the correct language before it reports an error. But perhaps I approached it the wrong way

Re: Slow git pushes: sitting 1 minute in pack-objects

2015-03-09 Thread Stephen Morton
Thanks Peff, I've done an strace and here's what I see. I'll try to put relevant information in as legible a form as possible. The operation is cpu-bound on a single core (note that yes, delta compression is using 8 threads. so that's obviously not the bottleneck) for the duration of the pack-obje

Re: Efficient parsing of `status -z` output

2015-03-09 Thread Matthew Rothenberg
On Mon, Mar 9, 2015 at 2:49 AM, Jeff King wrote: > $ git init > $ seq 1 1000 >file && git add file && git commit -m base > $ mv file other > $ echo foo >file > $ git add . > $ git status --short > M file > C file -> other Fantastic, I am able to replicate with these steps and wi

[PATCH v2] userdiff: funcname and word patterns for sh

2015-03-09 Thread Adrien Schildknecht
Add regexp based on the "Shell Command Language" specifications. Because of the lax syntax of sh, some corner cases may not be handled properly. Signed-off-by: Adrien Schildknecht --- Documentation/gitattributes.txt | 2 ++ t/t4018-diff-funcname.sh| 1 + t/t4018/sh-function

[PATCH] use isxdigit() for checking if a character is a hexadecimal digit

2015-03-09 Thread René Scharfe
Use the standard function isxdigit() to make the intent clearer and avoid using magic constants. Signed-off-by: Rene Scharfe --- sha1_name.c | 2 +- transport.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sha1_name.c b/sha1_name.c index 95f9f8f..6d10f05 100644 --- a/sh

Re: PLEASE HELP: Git for Yosemite 10.10.2

2015-03-09 Thread Thomas Ferris Nicolaisen
On Mon, Mar 9, 2015 at 10:26 PM, Siamak Nooraei wrote: > Hi there, > > I am taking an online data science course for which I am required to > download Git. > When I go to the Git's site, I can only download Git 2.2.1 Maverick. Also, > when I check in my CLI, it says "git version 1.9.3 (Apple Gi

PLEASE HELP: Git for Yosemite 10.10.2

2015-03-09 Thread Siamak Nooraei
Hi there, I am taking an online data science course for which I am required to download Git. When I go to the Git's site, I can only download Git 2.2.1 Maverick. Also, when I check in my CLI, it says "git version 1.9.3 (Apple Git-50)." I need to download a version of Git that is compatible wi

Re: git-scm.com website

2015-03-09 Thread Jonathan Nieder
Hi, David Kastrup wrote: > Jeff King writes: >> If people don't like git-scm.com and want to have an alternate site, > > I think that's the basic problem here. With all due respect: I don't actually see a major problem here. Any serious problems with the site can be fixed by people submitting

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

2015-03-09 Thread Kevin Daudt
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. Suggested-by: Junio C. Hamano Helped-by: Eric Sunshine Signed-off-by

[PATCH 2/2] Added tests for git reset -

2015-03-09 Thread Sundararajan R
As you had suggested @Junio, I have added the required tests. Please let me know if there is something is I should add. Signed-off-by: Sundararajan R Thanks-to: Junio C Hamano --- I have added 6 tests to check for the following cases: git reset - with no @{-1} git reset - with no @{-1} and file n

[PATCH 1/2] Adding - shorthand for @{-1} in RESET command

2015-03-09 Thread Sundararajan R
Please give feedback and suggest things I may have missed out on. I hope I have incorporated all the suggestions. Signed-off-by: Sundararajan R Thanks-to: Junio C Hamano --- I have attempted to resolve the ambiguity when there exists a file named - by communicating to the user that he/she can us

Re: [PATCH] userdiff: funcname and word patterns for sh

2015-03-09 Thread Matthieu Moy
Adrien Schildknecht writes: > + "^([ \t]*(function[ \t]*)?[a-zA-Z_][a-zA-Z0-9_]*[ \t]*\\([ \t]*\\).*)$", I guess this should be 'function[ \t]+' (+, not *). -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a m

Re: git-scm.com website

2015-03-09 Thread David Kastrup
Jeff King writes: > If people don't like git-scm.com and want to have an alternate site, I think that's the basic problem here. As long as people want to _have_ an alternate site rather than want to _write_ and _maintain_ an alternate site, any site will only be as representative of the Git com

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

2015-03-09 Thread Kyle J. McKay
Depending on how gpg was built, it may issue the following message to stderr when run: Warning: using insecure memory! When the test is collecting gpg output it is therefore not enough to just match on a "gpg: " prefix it must also match on a "Warning: " prefix wherever it needs to match lines

Re: [PATCH 1/3] connect.c: Fix memory leak

2015-03-09 Thread Torsten Bögershausen
On 2015-03-09 17.58, Stefan Beller wrote: > Signed-off-by: Stefan Beller > --- > connect.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/connect.c b/connect.c > index ce0e121..6090211 100644 > --- a/connect.c > +++ b/connect.c > @@ -739,6 +739,7 @@ struct child_process *git_connect(in

Re: git-scm.com website

2015-03-09 Thread Jeff King
On Mon, Mar 09, 2015 at 10:52:34AM -0700, Scott Chacon wrote: > > * some of the pull request can be rejected even if the developers want > > them, like this pull request to add back a list of contributors was: > > > > https://github.com/git/git-scm.com/pull/216 > > > > (By the way this pull reques

Re: Promoting Git developers

2015-03-09 Thread Philip Oakley
From: "David Kastrup" Michael J Gruber writes: Christian Couder venit, vidit, dixit 07.03.2015 08:18: Hi, On Fri, Mar 6, 2015 at 6:41 PM, David Kastrup wrote: At some point of time I think it may be worth reevaluating the toxic atmosphere against freelancers doing Git development. My

Re: git-scm.com website

2015-03-09 Thread David Kastrup
David Kastrup writes: > Scott Chacon writes: > >> On Mon, Mar 9, 2015 at 9:06 AM, David Kastrup wrote: >>> Personally, I consider the recent migration of the Emacs repository to >>> Git a bigger endorsement but then that's me. >> >> I would love to have Emacs on that page, actually. If you guys

Re: git-scm.com website

2015-03-09 Thread Stefan Beller
On Mon, Mar 9, 2015 at 10:49 AM, David Kastrup wrote: >> since many people coming to the page are doing research to figure out >> if they want to switch to it in their companies. It also demonstrates >> that these large companies are participating in the open source >> community > > Uh no, it does

Re: git-scm.com website

2015-03-09 Thread Scott Chacon
Hey, On Mon, Mar 9, 2015 at 10:12 AM, Christian Couder wrote: > A few other points about git-scm.com: > > * as Michael says it "still looks a bit like a ProGit/Github promotion site" > > * some of the pull request can be rejected even if the developers want > them, like this pull request to add b

Re: git-scm.com website

2015-03-09 Thread David Kastrup
Scott Chacon writes: > On Mon, Mar 9, 2015 at 9:06 AM, David Kastrup wrote: >> Personally, I consider the recent migration of the Emacs repository to >> Git a bigger endorsement but then that's me. > > I would love to have Emacs on that page, actually. If you guys want me > to add that, I'm happ

Re: git-scm.com website

2015-03-09 Thread Stefan Beller
On Mon, Mar 9, 2015 at 10:14 AM, Scott Chacon wrote: > > > > It might make sense to reduce this list just to "Projects" since those > > are actually more tangible and verifiable. Or scrap it altogether. > Sorry, I disagree with this. I think it's helpful for people to see > some important corpora

Re: git-scm.com website

2015-03-09 Thread Scott Chacon
Hey, On Mon, Mar 9, 2015 at 9:06 AM, David Kastrup wrote: > > On Mon, Mar 9, 2015 at 6:57 AM, Michael J Gruber > > wrote: > >> > >> Since we're talking business: git-scm.com still looks a bit like a > >> ProGit/Github promotion site. I don't have anything against either, and > >> git-scm.com pro

Re: git-scm.com website

2015-03-09 Thread Christian Couder
On Mon, Mar 9, 2015 at 5:37 PM, David Kastrup wrote: > Shawn Pearce writes: > >> On Mon, Mar 9, 2015 at 9:06 AM, David Kastrup wrote: >>> Shawn Pearce writes: >>> On Mon, Mar 9, 2015 at 6:57 AM, Michael J Gruber wrote: > > Since we're talking business: git-scm.com still looks

[PATCH 3/3] builtin/help.c: fix memory leak

2015-03-09 Thread Stefan Beller
Signed-off-by: Stefan Beller --- builtin/help.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/help.c b/builtin/help.c index 6133fe4..a1f5a0a 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -456,7 +456,7 @@ static void list_common_guides_help(void) int cmd_help

[PATCH 1/3] connect.c: Fix memory leak

2015-03-09 Thread Stefan Beller
Signed-off-by: Stefan Beller --- connect.c | 1 + 1 file changed, 1 insertion(+) diff --git a/connect.c b/connect.c index ce0e121..6090211 100644 --- a/connect.c +++ b/connect.c @@ -739,6 +739,7 @@ struct child_process *git_connect(int fd[2], const char *url, f

[PATCH 2/3] bundle.c: fix memory leak

2015-03-09 Thread Stefan Beller
The continue statements nearby also have an accompanying free(ref); Signed-off-by: Stefan Beller --- bundle.c | 1 + 1 file changed, 1 insertion(+) diff --git a/bundle.c b/bundle.c index 2e2dbd5..534783d 100644 --- a/bundle.c +++ b/bundle.c @@ -342,6 +342,7 @@ static int write_bundle_refs(int b

[PATCH] userdiff: funcname and word patterns for sh

2015-03-09 Thread Adrien Schildknecht
Add regexp based on the "Shell Command Language" specifications. Because of the lax syntax of sh, some corner cases may not be handled properly. Signed-off-by: Adrien Schildknecht --- Documentation/gitattributes.txt | 2 ++ t/t4018-diff-funcname.sh| 1 + t/t4018/sh-function

Re: git-scm.com website

2015-03-09 Thread David Kastrup
Shawn Pearce writes: > On Mon, Mar 9, 2015 at 9:06 AM, David Kastrup wrote: >> Shawn Pearce writes: >> >>> On Mon, Mar 9, 2015 at 6:57 AM, Michael J Gruber >>> wrote: Since we're talking business: git-scm.com still looks a bit like a ProGit/Github promotion site. I don't have an

[GSoC][PATCH] userdiff: funcname and word patterns for sh

2015-03-09 Thread Adrien Schildknecht
Hi, I'm a french student from EPITA and I plan to apply for the GSoC. Adrien Schildknecht (1): userdiff: funcname and word patterns for sh Documentation/gitattributes.txt | 2 ++ t/t4018-diff-funcname.sh| 1 + t/t4018/sh-function | 4 t/t4018/sh-function-comment

Re: git-scm.com website

2015-03-09 Thread Shawn Pearce
On Mon, Mar 9, 2015 at 9:06 AM, David Kastrup wrote: > Shawn Pearce writes: > >> On Mon, Mar 9, 2015 at 6:57 AM, Michael J Gruber >> wrote: >>> >>> Since we're talking business: git-scm.com still looks a bit like a >>> ProGit/Github promotion site. I don't have anything against either, and >>> g

Re: git-scm.com website

2015-03-09 Thread David Kastrup
Shawn Pearce writes: > On Mon, Mar 9, 2015 at 6:57 AM, Michael J Gruber > wrote: >> >> Since we're talking business: git-scm.com still looks a bit like a >> ProGit/Github promotion site. I don't have anything against either, and >> git-scm.com provides a lot of the information that users are loo

Re: git-scm.com website (was: Promoting Git developers)

2015-03-09 Thread Shawn Pearce
On Mon, Mar 9, 2015 at 6:57 AM, Michael J Gruber wrote: > > Since we're talking business: git-scm.com still looks a bit like a > ProGit/Github promotion site. I don't have anything against either, and > git-scm.com provides a lot of the information that users are looking > for, and that are hard t

[PATCH] t2203,t4011: adjust to changed intent-to-add treatment

2015-03-09 Thread Michael J Gruber
Signed-off-by: Michael J Gruber --- For the record, the tests would need to change like this, and it makes a lot of sense. After the change, "i-t-a" is not a "change staged in the index" any more - and in fact in never was, as "git commit" shows. t/t2203-add-intent.sh | 7 --- t/t4011-dif

Re: An interesting opinion on DVCS/git

2015-03-09 Thread Philip Oakley
From: "Stefan Beller" Sent: Monday, March 02, 2015 3:29 AM bitquabit.com/post/unorthodocs-abandon-your-dvcs-and-return-to-sanity -- The part that the author misses is not all the nice (or not so) stuff about having a copy of the full repository locally, for all the reasons he mentions, rathe

Re: Promoting Git developers

2015-03-09 Thread David Kastrup
Michael J Gruber writes: > Christian Couder venit, vidit, dixit 07.03.2015 08:18: >> Hi, >> >> On Fri, Mar 6, 2015 at 6:41 PM, David Kastrup wrote: >> >>> At some point of time I think it may be worth reevaluating the toxic >>> atmosphere against freelancers doing Git development. >> >> My op

[PATCH 2/2] diff-files: mark i-t-a paths as "new"

2015-03-09 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/add.c | 1 + diff-lib.c| 5 + 2 files changed, 6 insertions(+) diff --git a/builtin/add.c b/builtin/add.c index 3390933..ee370b0 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -63,6 +63,7 @@ static void update_callback(struct diff_queue_

[PATCH/RFC 0/2] Bug fixes regarding diff and "git add -N"

2015-03-09 Thread Nguyễn Thái Ngọc Duy
The first one attempts to fix "git status" reporting intent-to-add files as "changes to be committed". The "new file" report is now moved to "git diff-files" aka "changes not staged for commit" instead. I just want to check if I'm going on the right direction as core diff machinery is not really m

[PATCH 1/2] diff --cached: do not report i-t-a entries as "new"

2015-03-09 Thread Nguyễn Thái Ngọc Duy
Paths marked by "git add -N" are simply a reminder to the user that these files should be staged. If the user does not stage any of them, "git commit" will not record them. Align the behavior of "diff --cached" and "git commit". The most prominent result of this patch is "git status" no longer rep

Re: Promoting Git developers (was: Bashing freelancers)

2015-03-09 Thread Michael J Gruber
Christian Couder venit, vidit, dixit 07.03.2015 08:18: > Hi, > > On Fri, Mar 6, 2015 at 6:41 PM, David Kastrup wrote: > >> At some point of time I think it may be worth reevaluating the toxic >> atmosphere against freelancers doing Git development. > > My opinion on this is that the Git communi

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

2015-03-09 Thread karthik nayak
On 03/09/2015 12:39 AM, Junio C Hamano wrote: karthik nayak 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 wa

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

2015-03-09 Thread karthik nayak
On 03/09/2015 03:55 AM, Eric Sunshine wrote: On Thu, Mar 5, 2015 at 1:18 PM, Karthik Nayak 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 the

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

2015-03-09 Thread karthik nayak
On 03/09/2015 04:20 AM, Eric Sunshine wrote: On Thu, Mar 5, 2015 at 1:19 PM, Karthik Nayak 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. U

Re: [PATCH v2 4/4] t0302: test credential-store support for XDG_CONFIG_HOME

2015-03-09 Thread Matthieu Moy
Paul Tan writes: > diff --git a/t/t0302-credential-store.sh b/t/t0302-credential-store.sh > index f61b40c..7fe832d 100755 > --- a/t/t0302-credential-store.sh > +++ b/t/t0302-credential-store.sh > @@ -5,5 +5,97 @@ test_description='credential-store tests' > . "$TEST_DIRECTORY"/lib-credential.sh >

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

2015-03-09 Thread Kevin Daudt
On Sun, Mar 08, 2015 at 05:58:24PM -0400, Eric Sunshine wrote: > On Sun, Mar 8, 2015 at 11:03 AM, Kevin Daudt 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 eve

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

2015-03-09 Thread Thomas Ferris Nicolaisen
On Mon, Mar 9, 2015 at 1:00 AM, James wrote: > 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. Please read the guide on how to submit patches [1]. Although th

[PATCH 12/16] list-files: add --ignored

2015-03-09 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/list-files.c | 20 ++-- 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/builtin/list-files.c b/builtin/list-files.c index 93364b9..fbacad9 100644 --- a/builtin/list-files.c +++ b/builtin/list-files.c @@ -18,6 +18,7 @@

[PATCH 04/16] list-files: add tag to each entry, filter duplicate tags

2015-03-09 Thread Nguyễn Thái Ngọc Duy
All entry strings start with two-letter tag and a space. If all entries have the same tags, tags are not displayed. The outcome before and after this patch is the same. But it will be useful in future when there are more than one type of entry. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/li

[PATCH 08/16] list-files: add --color

2015-03-09 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/list-files.c | 24 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/builtin/list-files.c b/builtin/list-files.c index dc865a1..316f59c 100644 --- a/builtin/list-files.c +++ b/builtin/list-files.c @@ -5,6 +5,7 @

[PATCH 11/16] list-files: add --cached and --others

2015-03-09 Thread Nguyễn Thái Ngọc Duy
If no filter options are specified, --cached is the default. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/list-files.c | 62 1 file changed, 62 insertions(+) diff --git a/builtin/list-files.c b/builtin/list-files.c index eb51e7a..93364b9 1

[PATCH 16/16] list-files: make alias 'ls' default to 'list-files'

2015-03-09 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- config.c | 8 1 file changed, 8 insertions(+) diff --git a/config.c b/config.c index 15a2983..16209c6 100644 --- a/config.c +++ b/config.c @@ -40,6 +40,10 @@ static struct config_source *cf; static int zlib_compression_seen; +static const cha

[PATCH 15/16] list-files: delete redundant cached entries

2015-03-09 Thread Nguyễn Thái Ngọc Duy
When both --cached and one of -amdAMD is used together we may have two entries of the same path, e.g. " foo" and "MM foo". In this case it's pretty clear that "foo" must be tracked, no need to display " foo". The new function does that. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/list-fil

[PATCH 13/16] list-files: add --unmerged

2015-03-09 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/list-files.c | 47 +++ 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/builtin/list-files.c b/builtin/list-files.c index fbacad9..a82410d 100644 --- a/builtin/list-files.c +++ b/builtin/list

[PATCH 14/16] list-files: add file modification options -[admADM]

2015-03-09 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/list-files.c | 71 1 file changed, 66 insertions(+), 5 deletions(-) diff --git a/builtin/list-files.c b/builtin/list-files.c index a82410d..74836f6 100644 --- a/builtin/list-files.c +++ b/builtin

[PATCH 10/16] list-files: new indicator '&' for submodules when -F is used

2015-03-09 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/list-files.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builtin/list-files.c b/builtin/list-files.c index 97fa8bf..eb51e7a 100644 --- a/builtin/list-files.c +++ b/builtin/list-files.c @@ -51,6 +51,8 @@ static void append_indicator(struct

[PATCH 09/16] list-files: add -F/--classify

2015-03-09 Thread Nguyễn Thái Ngọc Duy
This appends an indicator after the file name if it's executable, a directory and so on, like in GNU ls. In fact append_indicator() is a rewrite from get_type_indicator() in coreutils.git commit 7326d1f1a67edf21947ae98194f98c38b6e9e527. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/list-files.

[PATCH 01/16] list-files: command skeleton

2015-03-09 Thread Nguyễn Thái Ngọc Duy
list-files is supposed to be the user friendly version of ls-files, or an alternative to git-status. Nothing fancy in this patch yet. Signed-off-by: Nguyễn Thái Ngọc Duy --- .gitignore | 1 + Makefile | 1 + builtin.h | 1 + builtin/list-file

[PATCH 05/16] list-files: add --[no-]column, -C and -1

2015-03-09 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/list-files.c | 16 1 file changed, 16 insertions(+) diff --git a/builtin/list-files.c b/builtin/list-files.c index 18af65c..95a2e19 100644 --- a/builtin/list-files.c +++ b/builtin/list-files.c @@ -4,10 +4,12 @@ #include "pathspec.

[PATCH 02/16] list-files: make :(glob) pathspec default

2015-03-09 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/list-files.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builtin/list-files.c b/builtin/list-files.c index ac33f13..b99f2b7 100644 --- a/builtin/list-files.c +++ b/builtin/list-files.c @@ -65,6 +65,8 @@ int cmd_list_files(int argc, const c

[PATCH 03/16] list-files: show paths relative to cwd

2015-03-09 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/list-files.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/list-files.c b/builtin/list-files.c index b99f2b7..c444a53 100644 --- a/builtin/list-files.c +++ b/builtin/list-files.c @@ -3,6 +3,7 @@ #include "parse-optio

[PATCH 07/16] list-files: show directories as well as files

2015-03-09 Thread Nguyễn Thái Ngọc Duy
The index does not store directories explicitly (except submodules) so we have to figure them out from file list when output lis depth-limited. The function add_directory() can generate duplicate entries, which is cleaned up before displaying. Helped-by: Eric Sunshine Helped-by: Junio C Hamano

[PATCH 06/16] list-files: add --max-depth and -R

2015-03-09 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/list-files.c | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/builtin/list-files.c b/builtin/list-files.c index 95a2e19..9a55ea6 100644 --- a/builtin/list-files.c +++ b/builtin/list-files.c @@ -10,6 +10,7 @@ static struct

[PATCH 00/16] nd/list-files redesign

2015-03-09 Thread Nguyễn Thái Ngọc Duy
On Tue, Feb 24, 2015 at 2:00 AM, Junio C Hamano wrote: > Michael J Gruber writes: > >> status, status -s and the like are in an ordinary user's tool box. >> ls-files isn't, at least not with "-t", which we even mark as deprecated. >> >> That makes me wonder, though, how difficult it would be to >

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

2015-03-09 Thread Anton Trunov
On 08/03/15 11:06, Junio C Hamano wrote: > Anton Trunov 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 ch

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

2015-03-09 Thread Michael J Gruber
Kyle J. McKay venit, vidit, dixit 09.03.2015 06:32: > 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 >>> wrote: Perhaps this is better? Unfortunately when run

Re: Git merge driver / attributes bug in 2.3.1?

2015-03-09 Thread Michael J Gruber
Gondek, Andreas venit, vidit, dixit 09.03.2015 10:02: > We used a merge driver to create a conflict semaphore file whenever a > merge conflict occurs in Atlassian Stash. This worked for several > month until we got to update our Git version because of another > problem. That is the first issue: Ca

Re: [PATCH] log: decorate detached HEAD differently

2015-03-09 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 06.03.2015 20:03: > Michael J Gruber writes: > >> "git status" and "git branch" let the user know when the HEAD is >> detached, as well as the current branch, while "git log --decorate" does not. >> >> Change the decoration by a non-detached HEAD pointing to bra

AW: Git merge driver / attributes bug in 2.3.1?

2015-03-09 Thread Gondek, Andreas
We used a merge driver to create a conflict semaphore file whenever a merge conflict occurs in Atlassian Stash. This worked for several month until we got to update our Git version because of another problem. If I understand it correctly, a merge driver is executed before the normal internal me

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

2015-03-09 Thread Sudhanshu Shekhar
1) Confirm error message when git reset is used with no previous branch 2) Confirm git reset - works like git reset @{-1} 3) Confirm "-" is always treated as a commit unless the -- file option is specified Signed-off-by: Sudhanshu Shekhar Thanks-to: David Aguilar --- David, thank you for your rema

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

2015-03-09 Thread Sudhanshu Shekhar
"-" now means the previous branch. Signed-off-by: Sudhanshu Shekhar Thanks-to: Eric Sunshine, Junio C Hamano, Matthieu Moy --- builtin/reset.c | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/builtin/reset.c b/builtin/reset.c index 4c08ddc..02f33ef 100644 --- a/builtin

Re: Slow git pushes: sitting 1 minute in pack-objects

2015-03-09 Thread Jeff King
On Thu, Mar 05, 2015 at 04:03:07PM -0500, Stephen Morton wrote: > I'm experiencing very slow git pushes. On the order of 1 minute to push a > trivial one-line change. When I set GIT_TRACE=1, I see that it seems to be > taking a lot of time in the pack-objects phase. Can you tell what pack-objects

Re: Bug? git submodule add SSL certificate problem: unable to get local issuer certificate

2015-03-09 Thread Jeff King
On Thu, Mar 05, 2015 at 04:20:10PM +0100, Aschemann Gerd wrote: > seems to be a bug: If adding a submodule from an https URL with a certificate > issued by StartSSL (or even a private/self-signed one?) leads to the > following error: > > $ git -c http.sslverify=false submodule add https://exa

Re: [PATCH 2/2] help.c: use SHELL_PATH instead of hard-coded "/bin/sh"

2015-03-09 Thread Jeff King
On Sun, Mar 08, 2015 at 11:32:22PM -0700, Kyle J. McKay wrote: > >It is a common convention to make the first argument the command > >name without its path, and this change breaks that convention. > > Hmpf. I present these for your consideration: > > $ sh -c 'echo $0' > sh > $ /bin/sh -c 'echo