Re: Why is git fetch --prune so much slower than git remote prune?

2015-03-06 Thread Jeff King
On Fri, Mar 06, 2015 at 05:48:39PM +0100, Ævar Arnfjörð Bjarmason wrote: The --prune option to fetch added in v1.6.5-8-gf360d84 seems to be around 20-30x slower than the equivalent operation with git remote prune. I'm wondering if I'm missing something and fetch does something more, but it

[ANNOUNCE] Git v2.3.2

2015-03-06 Thread Junio C Hamano
The latest maintenance release Git v2.3.2 is now available at the usual places. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories all have a copy of the 'v2.3.2' tag and the 'maint' branch that the tag points at: url =

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

2015-03-06 Thread Sundararajan R
Hi all, I am a GSoC '15 aspirant for git. In this commit I have directly associated - to @{-1} except when it refers to a filename. All the given tests pass(except those which shouldn't). I have to add a failsafe for the case in when there is no branch as @{-1}. For this I have a rough idea

Re: [PATCH] protocol upload-pack-v2

2015-03-06 Thread Duy Nguyen
On Sat, Mar 7, 2015 at 6:38 AM, Stefan Beller sbel...@google.com wrote: +Reference Discovery (v2) + + +In version 2, reference discovery is initiated by the client with +want-refs line. The client may skip reference discovery phase +entirely by not sending want-refs

Re: [PATCH] protocol upload-pack-v2

2015-03-06 Thread Duy Nguyen
I'm still wondering if we should reserve more from the packet length. We have used length for pkt-flush. Shawn pointed out that we still have 0001, 0002 and 0003 but we may use some of them to avoid abuse of pkt-flush in some cases. Perhaps we could limit packet length to 0xfff0, so we have

Re: [PATCH] daemon: use strbuf for hostname info

2015-03-06 Thread René Scharfe
Am 06.03.2015 um 22:06 schrieb Jeff King: On Fri, Mar 06, 2015 at 09:57:22AM +0100, René Scharfe wrote: if (port) { - free(tcp_port); - tcp_port = sanitize_client(port); +

Re: [PATCH] daemon: use strbuf for hostname info

2015-03-06 Thread Jeff King
On Sat, Mar 07, 2015 at 01:54:12AM +0100, René Scharfe wrote: These probably want to all be strbuf_release(). Again, I doubt it matters much because this is a forked daemon serving only a single request (so they'll get freed by the OS soon anyway), but I think freeing the memory here follows

Re: [PATCH] protocol upload-pack-v2

2015-03-06 Thread Stefan Beller
On Fri, Mar 6, 2015 at 3:38 PM, Stefan Beller sbel...@google.com wrote: From: Duy Nguyen pclo...@gmail.com Oops. I edited the proposal from Duy heavily(?), such that it is different from what he proposed 4 days ago. In my impression this is what most of the participants would agree on. -- To

A note from the maintainer

2015-03-06 Thread Junio C Hamano
[note to regular readers; there are a few updated paragraphs, regarding our association with SFC and also our security mailing list.] Welcome to the Git development community. This message is written by the maintainer and talks about how Git project is managed, and how you can work with it. *

What's cooking in git.git (Mar 2015, #03; Fri, 6)

2015-03-06 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. A few more batches of topics have been merged to 'master', including both fixes and enhancements. The second maintenance release for v2.3 has

Re: [PATCH] daemon: use strbuf for hostname info

2015-03-06 Thread René Scharfe
Am 06.03.2015 um 22:06 schrieb Jeff King: On Fri, Mar 06, 2015 at 09:57:22AM +0100, René Scharfe wrote: Convert hostname, canon_hostname, ip_address and tcp_port to strbuf. This allows to get rid of the helpers strbuf_addstr_or_null() and STRARG because a strbuf always represents a valid

Re: [PATCH] protocol upload-pack-v2

2015-03-06 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: @@ -67,7 +74,6 @@ gracefully with an error message. error-line = PKT-LINE(ERR SP explanation-text) - SSH Transport Noise? @@ -124,9 +130,56 @@ has, the first can 'fetch' from the second. This operation determines what data

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

2015-03-06 Thread Junio C Hamano
Karthik Nayak karthik@gmail.com writes: 'git -C ' unhelpfully dies with error Cannot change to '', whereas the shell treats `cd ' as a no-op. Taking the shell's behavior as a precedent, teach git to treat `-C ' as a no-op, as well. Test to check the no-op behaviour of -C path when path

Re: [PATCH] daemon: use strbuf for hostname info

2015-03-06 Thread Jeff King
On Sat, Mar 07, 2015 at 01:20:22AM +0100, René Scharfe wrote: Not a big deal, but do we want to rename sanitize_client_strbuf to sanitize_client? It only had the unwieldy name to distinguish it from this one. A patch would look like this. The result is shorter, but no win in terms of

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

2015-03-06 Thread Eric Sunshine
On Fri, Mar 6, 2015 at 6:18 AM, Karthik Nayak karthik@gmail.com wrote: 'git -C ' unhelpfully dies with error Cannot change to '', whereas the shell treats `cd ' as a no-op. Taking the shell's behavior as a precedent, teach git to treat `-C ' as a no-op, as well. Test to check the no-op

[PATCH] protocol upload-pack-v2

2015-03-06 Thread Stefan Beller
From: Duy Nguyen pclo...@gmail.com Signed-off-by: Stefan Beller sbel...@google.com --- Notes: This is just aimed at untangling capabilities and refs advertisement, no new features. Hence this is missing the proposal from Duy to save one RTT. I have the impression that most

Git very slow ?

2015-03-06 Thread Ken Moffat
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 'commit' take a long time before anything happens. I assumed that the

[PATCH] [GSoC][MICRO] Forbid log --graph --no-walk

2015-03-06 Thread Dongcan Jiang
Because --graph is about connected history while --no-walk is about discrete points. revision.c: Judge whether --graph and --no-walk come together when running git-log. buildin/log.c: Set git-log cmd flag. Documentation/rev-list-options.txt: Add specification on the forbidden usage.

[PATCHv2 2/2] branch: name detached HEAD analogous to status

2015-03-06 Thread Michael J Gruber
git status carefully names a detached HEAD at resp. from a rev or ref depending on whether the detached HEAD has moved since. git branch always uses from, which can be confusing, because a status-aware user would interpret this as moved detached HEAD. Make git branch use the same logic and

[PATCHv2 0/2] branch output for detached HEAD

2015-03-06 Thread Michael J Gruber
So here's a little refactoring of wt-status, to help branch use the same logic regarding from/at for a detached HEAD. Michael J Gruber (2): wt-status: refactor detached HEAD analysis branch: name detached HEAD analogous to status builtin/branch.c | 13 ++---

Microsoft Exchange 2015

2015-03-06 Thread Tong, W.
Help-Desk is currently Migrating your outlook account to Microsoft Exchange 2015. With the introduction of Internet Explorer 9, Outlook Express has apparently been removed from the installation package on our Message Center. Please copy or click the link

Microsoft Exchange 2015

2015-03-06 Thread Tong, W.
Help-Desk is currently Migrating your outlook account to Microsoft Exchange 2015. With the introduction of Internet Explorer 9, Outlook Express has apparently been removed from the installation package on our Message Center. Please copy or click the link

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

2015-03-06 Thread Karthik Nayak
'git -C ' unhelpfully dies with error Cannot change to '', whereas the shell treats `cd ' as a no-op. Taking the shell's behavior as a precedent, teach git to treat `-C ' as a no-op, as well. Test to check the no-op behaviour of -C path when path is empty, written by Junio C Hamano. Helped-by:

Re: [PATCH] for the SoC15 micro project, Make git -C '' cmd not to barf.

2015-03-06 Thread Matthieu Moy
Prudhvee Narasimha Sadha prudhvi.s...@gmail.com writes: Hi, here is my patch for the micro project, Please review the code. Please, read Documentation/SubmittingPatches. Also, read the comments on the other submission for the same problem on the list, they also apply to your version. --

Re: Git merge driver / attributes bug in 2.3.1?

2015-03-06 Thread Michael J Gruber
Gondek, Andreas venit, vidit, dixit 06.03.2015 14:31: The archive contains my test repository, the merge driver and the .gitconfig of the user. We don't have a global .gitconfig. Thanks for the test repo! Alas, the merge driver gets executed with v1.9.0-rc3, v1.8.5 and v1.7.0, at least over

[PATCHv2 1/2] wt-status: refactor detached HEAD analysis

2015-03-06 Thread Michael J Gruber
wt_status_print() is the only caller of wt_status_get_detached_from(). The latter performs most of the analysis of a detached HEAD, including finding state-detached_from; the caller checks whether the detached HEAD is still at state-detached_from or has moved away. Move that last bit of analysis

Re: [PATCH] [GSoC][MICRO] Forbid log --graph --no-walk

2015-03-06 Thread René Scharfe
Am 06.03.2015 um 09:55 schrieb Dongcan Jiang: Because --graph is about connected history while --no-walk is about discrete points. revision.c: Judge whether --graph and --no-walk come together when running git-log. buildin/log.c: Set git-log cmd flag. Documentation/rev-list-options.txt: Add

Re: [PATCH v3] git: make git -C '' cmd not to barf

2015-03-06 Thread karthik nayak
On 03/06/2015 02:23 PM, Eric Sunshine wrote: On Fri, Mar 6, 2015 at 2:05 AM, Karthik Nayak karthik@gmail.com wrote: It now acts like cd '' and does not barf and treats it as a no-op. What does barf mean in this context? Does the program crash? Spit out nonsensical messages? Misbehave in

Re: Checkout --force without complete overwrite?

2015-03-06 Thread Kevin D
On Fri, Mar 06, 2015 at 02:39:58AM +, Phil Hord (hordp) wrote: I have a repo whose workdir tends to get pretty dirty as I jump around from branch to branch tending weeds and whatnot. Sometimes when I try to switch branches git refuses because of local file changes. git checkout

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

2015-03-06 Thread Matthieu Moy
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 suggestion a bit stronger since it implies that it will be taken into account in the selection). Signed-off-by: Matthieu Moy matthieu@imag.fr ---

Re: [ANNOUNCE] Git Merge Contributors Summit, April 8th, Paris

2015-03-06 Thread Christian Couder
On Thu, Mar 5, 2015 at 11:24 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder christian.cou...@gmail.com writes: On Tue, Feb 24, 2015 at 11:09 PM, Jeff King p...@peff.net wrote: I wanted to make one more announcement about this, since a few more details have been posted at:

[PATCHv2] sequencer: preserve commit messages

2015-03-06 Thread Michael J Gruber
sequencer calls commit with default options, which implies --cleanup=default unless the user specified something else in their config. This leads to cherry-picked commits getting a cleaned up commit message, which is usually not an intended side-effect. Make the sequencer use --cleanup=verbatim

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

2015-03-06 Thread Akshay Aurora
Thanks for replying. I'll try sending the patch directly using gmail smtp servers next time. Going by the description of the options. I doubt --graph and --no-walk would ever make sense together. So my patch forbids these two options together for all commands calling setup_revisions(). And isn't

Re: [ANNOUNCE] Git Merge Contributors Summit, April 8th, Paris

2015-03-06 Thread Christian Couder
On Fri, Mar 6, 2015 at 11:52 AM, Michael J Gruber g...@drmicha.warpmail.net wrote: Junio C Hamano venit, vidit, dixit 05.03.2015 23:24: Christian Couder christian.cou...@gmail.com writes: I'd like the Git project to set up a more organized way to pay back the travel costs and the conference

Re: [PATCH] [GSoC][MICRO] Forbid log --graph --no-walk

2015-03-06 Thread Dongcan Jiang
Hi, Eric and René Thanks for your suggestions. Good ideas! Genuine question: Despite the GSoC micro-project mentioning only 'log', is it ever meaningful for these two options to be specified together? I suspect not, but it would be nice to hear from someone more familiar with the issue. If

Why is git fetch --prune so much slower than git remote prune?

2015-03-06 Thread Ævar Arnfjörð Bjarmason
The --prune option to fetch added in v1.6.5-8-gf360d84 seems to be around 20-30x slower than the equivalent operation with git remote prune. I'm wondering if I'm missing something and fetch does something more, but it doesn't seem so. To test this clone git.git, create 1000 branches it in, create

Re: [ANNOUNCE] Git Merge Contributors Summit, April 8th, Paris

2015-03-06 Thread Junio C Hamano
On Fri, Mar 6, 2015 at 4:55 AM, Christian Couder christian.cou...@gmail.com wrote: I had more in mind the people who mentored GSoC students (and this way helped the Git project get some money)... Just on this part, because I want to avoid giving a wrong impression to discourage potential

Re: [PATCH v3] git: make git -C '' cmd not to barf

2015-03-06 Thread Andreas Schwab
Karthik Nayak karthik@gmail.com writes: + if (*((*argv)[1]) == 0) IMHO (*argv)[1][0] is easier to understand. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely

Re: [PATCH] log: decorate detached HEAD differently

2015-03-06 Thread Michael J Gruber
Michael J Gruber venit, vidit, dixit 06.03.2015 17:15: ... and maybe the patch title should be different for v2, too: log: decorate non-detached HEAD differently Not my day today it seems, but this is my last patch for today. Michael -- To unsubscribe from this list: send the line unsubscribe

[PATCH 0/2] [git-gui] Open existing repository with submodules

2015-03-06 Thread Remi Rampin
I'm resubmitting this patch series, hopefully someone takes notice this time. The GUI cannot currently open a submodule because it fails to recognize the git link file (regular .git file with content gitdir: ...). Previous thread: http://thread.gmane.org/gmane.comp.version-control.git/263199

Re: [ANNOUNCE] Git Merge Contributors Summit, April 8th, Paris

2015-03-06 Thread Jeff King
On Fri, Mar 06, 2015 at 11:52:06AM +0100, Michael J Gruber wrote: OTOH I can see where Christian's question is coming from: Who is even supposed to ask for support? Not just as in who is a developer, but also what are finance hardships: In my mind, the minimum line for hardship is basically

[PATCH] log: decorate detached HEAD differently

2015-03-06 Thread Michael J Gruber
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 branch foo to HEAD-foo. This can be seen as giving more information about the decoration item itself in

[PATCH] http: Include locale.h when using setlocale()

2015-03-06 Thread Ævar Arnfjörð Bjarmason
Since v2.3.0-rc1-37-gf18604b we've been using setlocale() here without importing locale.h. Oddly enough this only causes issues for me under -O0 on GCC Clang. I.e. if I do: $ git clean -dxf; make -j 1 V=1 CFLAGS=-g -O0 -Wall http.o I'll get this on clang 3.5.0-6 GCC 4.9.1-19 on Debian:

Re: [ANNOUNCE] Git Merge Contributors Summit, April 8th, Paris

2015-03-06 Thread Jeff King
On Fri, Mar 06, 2015 at 01:06:15PM +0100, Christian Couder wrote: And anyway in the case-by-case as needed basis, you still have the problem to decide how much to pay back each one, in case people ask for more than what is available. In this case it could be seen as very unfair that rules are

Reminder for Invited Authors: Upload it until March 20, 2015. Extended Versions of all the Invited papers will be promoted for direct publication in 36 Collaborating ISI/SCI Journals (with Impact Fac

2015-03-06 Thread Reni Dimitrova .
Dear Invited Author, We can host your Invited Paper in our new international conferences in Barcelona, Spain, April 7-9, 2015 (Tuesday 7, Wednesday 8, Thursday 9) www.inase.org provided that you will upload it until March 20, 2015. As you know the invited papers have double time for

[PATCH 1/2] Fixes chooser not accepting gitfiles

2015-03-06 Thread Remi Rampin
Makes _is_git handle the case where the path is a gitdir: ... file. Signed-off-by: Remi Rampin remiram...@gmail.com --- lib/choose_repository.tcl | 10 ++ 1 file changed, 10 insertions(+) diff --git a/lib/choose_repository.tcl b/lib/choose_repository.tcl index 92d6022..abc6b1d 100644

[PATCH 2/2] Makes chooser set 'gitdir' to the resolved path

2015-03-06 Thread Remi Rampin
If _is_git follows a gitdir: ... file link to get to the actual repository, we want _gitdir to be set to that final path. Signed-off-by: Remi Rampin remiram...@gmail.com --- lib/choose_repository.tcl | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git

Re: [RFH] GSoC 2015 application

2015-03-06 Thread Duy Nguyen
On Wed, Mar 04, 2015 at 10:19:16PM -0800, Junio C Hamano wrote: But we would need some way to say a set-based cut-off; I do not think using --since for that purpose is a good idea, though, because that is already taken for date-based cut-off, and mixing them together will introduce confusion.

Re: [PATCH 2/2] Disclaimer about the number of slots.

2015-03-06 Thread Matthieu Moy
Jeff King p...@peff.net writes: On Wed, Mar 04, 2015 at 08:19:31AM +0100, Matthieu Moy wrote: So, sending this in case other people think it's a good idea, but I won't fight for it in case you don't think it is. [...] --- a/SoC-2015-Ideas.md +++ b/SoC-2015-Ideas.md @@ -20,6 +20,11 @@

Re: [PATCHv4 0/3] More diffs for commit/status

2015-03-06 Thread Michael J Gruber
Michael J Gruber venit, vidit, dixit 06.03.2015 10:43: ... So, I both managed to - omit the cover letter subject (which format-patch helpfully does *not* fill in from the branch description) and - mis-copy the in-reply-to message id (to a non-existent one). Thunderbird user Sorry. I

Re: Git merge driver / attributes bug in 2.3.1?

2015-03-06 Thread Michael J Gruber
Gondek, Andreas venit, vidit, dixit 05.03.2015 14:30: Hello, after upgrading the Git installation on one of our development servers from 1.9.0-rc3 to 2.3.1 we are experiencing strange behavior of merge drivers. A merge driver registered as * merge=name_of_merge_driver in the

Re: [ANNOUNCE] Git Merge Contributors Summit, April 8th, Paris

2015-03-06 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 05.03.2015 23:24: Christian Couder christian.cou...@gmail.com writes: On Tue, Feb 24, 2015 at 11:09 PM, Jeff King p...@peff.net wrote: I wanted to make one more announcement about this, since a few more details have been posted at: http://git-merge.com/

[PATCHv4 1/3] t7508: .gitignore 'expect' and 'output' files

2015-03-06 Thread Michael J Gruber
From: Junio C Hamano gits...@pobox.com These files are used to observe the behaviour of the 'status' command and if there weren't any such observer, the expected output from 'status' wouldn't even mention them. Place them in .gitignore to unclutter the output expected by the tests. An added

[PATCHv4 0/3]

2015-03-06 Thread Michael J Gruber
v4 has an additional line with 50*- before the second header (if there is any). Also, if status spewed out a cut-line (for commit) we emit a trailer line before the first header (if there is any) so that it doesn't get sucked in visually with the cut line description. If there is only a second

Re: [PATCH 1/2] git-credential-store: support XDG config dir

2015-03-06 Thread Matthieu Moy
Paul Tan pyoka...@gmail.com writes: Hi all, Thanks for the review. I apologize for rushing the patch out as I wanted to get feedback on the new behavior before committing to any more code changes. There is no problem sending unfinished versions for discussions. If unsure, send it as

Re: [PATCH] [GSoC][MICRO] Forbid log --graph --no-walk

2015-03-06 Thread Eric Sunshine
On Fri, Mar 6, 2015 at 3:55 AM, Dongcan Jiang dongcan.ji...@gmail.com wrote: Forbid log --graph --no-walk Style: drop capitalization in the Subject: line. Also prefix with the command or module being modified, followed by a colon. So: log: forbid combining --graph and --no-walk or:

[PATCH] daemon: use strbuf for hostname info

2015-03-06 Thread René Scharfe
Convert hostname, canon_hostname, ip_address and tcp_port to strbuf. This allows to get rid of the helpers strbuf_addstr_or_null() and STRARG because a strbuf always represents a valid (initially empty) string. sanitize_client() becomes unused and is removed as well. Signed-off-by: Rene Scharfe

[PATCHv4 3/3] commit/status: show the index-worktree diff with -v -v

2015-03-06 Thread Michael J Gruber
git commit and git status in long format show the diff between HEAD and the index when given -v. This allows previewing a commit to be made. They also list tracked files with unstaged changes, but without a diff. Introduce '-v -v' which shows the diff between the index and the worktree in

[PATCHv4 2/3] t7508: test git status -v

2015-03-06 Thread Michael J Gruber
status -v had no test. Include one. This also requires changing the .gitignore subtests, which is a good thing: they include testing a .gitignore pattern now. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- t/t7508-status.sh | 14 -- 1 file changed, 12 insertions(+), 2

Bashing freelancers (was: [ANNOUNCE] Git Merge Contributors Summit, April 8th, Paris)

2015-03-06 Thread David Kastrup
Junio C Hamano gits...@pobox.com writes: Of course, I am hoping that all the mentors are doing GSoC not for money but out of love of our software and our community, At some point of time I think it may be worth reevaluating the toxic atmosphere against freelancers doing Git development. There

Re: [PATCH v3] git: make git -C '' cmd not to barf

2015-03-06 Thread Junio C Hamano
Andreas Schwab sch...@linux-m68k.org writes: Karthik Nayak karthik@gmail.com writes: +if (*((*argv)[1]) == 0) IMHO (*argv)[1][0] is easier to understand. Thanks for saying that. I had to scratch my head every time I had to see this change from various people ;-) --

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

2015-03-06 Thread Junio C Hamano
Akshay Aurora akshayaur...@yahoo.com writes: Signed-off-by: Akshay Aurora akshayaur...@yahoo.com --- This is my first patch for a GSoC Microproject, would be great to have your feedback. revision.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/revision.c

Re: [GSoC microproject] Add XDG support to the credential-store helper

2015-03-06 Thread Matthieu Moy
Paul Tan pyoka...@gmail.com writes: Hi Luis, On Fri, Mar 6, 2015 at 7:41 AM, Luis Ressel ara...@aixah.de wrote: Okay, I've had a look at Paul's patch for this. Sorry again for the dupe, I must've missed it before. I guess I'll attempt another microproject. However, I feel like my patch is

Re: Bashing freelancers

2015-03-06 Thread Junio C Hamano
David Kastrup d...@gnu.org writes: Good work is worth good money. Suggesting that people who are not able to work for free are morally inferior is not conducive for a cooperative work atmosphere. Yes, but I do not think anybody did any such thing. -- To unsubscribe from this list: send the

Re: Surprising interaction of binary and eol gitattributes

2015-03-06 Thread Michael Haggerty
On 03/06/2015 06:59 AM, Torsten Bögershausen wrote: On 03/05/2015 11:08 PM, Junio C Hamano wrote: Michael Haggerty mhag...@alum.mit.edu writes: I would expect that the following .gitattributes file * eol=crlf *.png -text would leave EOL translation turned off for PNG

Re: [PATCH] [GSoC][MICRO] Forbid log --graph --no-walk

2015-03-06 Thread Junio C Hamano
Dongcan Jiang dongcan.ji...@gmail.com writes: At first, I also tried to only judge the value of revs-no_walk revs-graph, but unfortunately, it failed to pass all cases in t4052-stat-output.sh. e.g. command git show --stat --graph failed to get the correct result. Finally, this is because

Re: [PATCH] log: decorate detached HEAD differently

2015-03-06 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net 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 branch foo to HEAD-foo. This can be seen as

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

2015-03-06 Thread karthik nayak
On 03/06/2015 05:15 AM, Junio C Hamano wrote: Karthik Nayak karthik@gmail.com writes: +const char *sha1_object_info_literally(const unsigned char *sha1) +{ + enum object_type type; + struct strbuf sb = STRBUF_INIT; + struct object_info oi = {NULL}; + + oi.typename

Re: [PATCHv2] sequencer: preserve commit messages

2015-03-06 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: sequencer calls commit with default options, which implies --cleanup=default unless the user specified something else in their config. This leads to cherry-picked commits getting a cleaned up commit message, which is usually not an intended

Re: [PATCH] http: Include locale.h when using setlocale()

2015-03-06 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason ava...@gmail.com writes: Since v2.3.0-rc1-37-gf18604b we've been using setlocale() here without importing locale.h. Oddly enough this only causes issues for me under -O0 on GCC Clang. Sorry for not making this entry in What's cooking report very prominent: *

Re: [PATCHv2 2/2] branch: name detached HEAD analogous to status

2015-03-06 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: git status carefully names a detached HEAD at resp. from a rev or ref depending on whether the detached HEAD has moved since. git branch always uses from, which can be confusing, because a status-aware user would interpret this as moved

Re: [GSoC microproject] Add XDG support to the credential-store helper

2015-03-06 Thread Paul Tan
Hi, Reading my previous message again, I apologize if it sounded conflicting. Truth to be told, I see merits in both proposed behaviors, but it all depends on whether we want git-credentials-store to support an arbitrary number of config files (now or in the future) or just two. I'm not sitting

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

2015-03-06 Thread Junio C Hamano
karthik nayak karthik@gmail.com writes: ... I suspect that the caller should supply a pointer to struct object_info, i.e. something along these lines: struct object_info oi = { NULL }; struct strbuf sb = STRBUF_INIT; enum object_type type; ... oi.typename =

[GSoC microproject help] Allow - as a short-hand for @{-1} in more places

2015-03-06 Thread Sundararajan R
Hi All, I am a sophomore at Indian Institute of Technology Kanpur and am a GSoC aspirant for git. Although I have been using git from a long time, this is the first occasion when I have picked up reading its source code. Can somebody please help me by telling me how to start off with the above

Re: Bashing freelancers

2015-03-06 Thread David Kastrup
Junio C Hamano gits...@pobox.com writes: David Kastrup d...@gnu.org writes: Good work is worth good money. Suggesting that people who are not able to work for free are morally inferior is not conducive for a cooperative work atmosphere. Yes, but I do not think anybody did any such thing.

Re: [PATCH] daemon: use strbuf for hostname info

2015-03-06 Thread Jeff King
On Fri, Mar 06, 2015 at 09:57:22AM +0100, René Scharfe wrote: Convert hostname, canon_hostname, ip_address and tcp_port to strbuf. This allows to get rid of the helpers strbuf_addstr_or_null() and STRARG because a strbuf always represents a valid (initially empty) string. sanitize_client()

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

2015-03-06 Thread Junio C Hamano
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 suggestion a bit stronger since it implies that it

Re: [GSoC microproject help] Allow - as a short-hand for @{-1} in more places

2015-03-06 Thread Junio C Hamano
Sundararajan R dyou...@gmail.com writes: Although I have been using git from a long time, this is the first occasion when I have picked up reading its source code. Can somebody please help me by telling me how to start off with the above mentioned microproject? A good place to start on

Re: [GSoC microproject help] Allow - as a short-hand for @{-1} in more places

2015-03-06 Thread Akshay Aurora
Hi Sundararajan, Welcome to Git Community. You need to look for commands dealing with branches, and allow '-' as shorthand for @{-1}. You can look at patches already sent for this microproject. One of the students has already started working on git reset command [0]. Junio, has raised some

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

2015-03-06 Thread Akshay Aurora
Thanks Junio. Working on v2 for this patch. On Sat, Mar 7, 2015 at 12:00 AM, Junio C Hamano gits...@pobox.com wrote: Akshay Aurora akshayaur...@yahoo.com writes: Signed-off-by: Akshay Aurora akshayaur...@yahoo.com --- This is my first patch for a GSoC Microproject, would be great to have

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

2015-03-06 Thread Jeff King
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 suggestion a bit stronger since it implies that it will be taken into account in the

Re: Surprising interaction of binary and eol gitattributes

2015-03-06 Thread Torsten Bögershausen
Oops, I misunderstood an internal bug report. In seems that it is the following scenario that is incorrect: *.png text=auto eol=crlf Hm, I don't know if we support this combination at all. The current logic supports auto-detection of text/binary, * text=auto (the files will get the line

Re: Git merge driver / attributes bug in 2.3.1?

2015-03-06 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: Gondek, Andreas venit, vidit, dixit 06.03.2015 14:31: The archive contains my test repository, the merge driver and the .gitconfig of the user. We don't have a global .gitconfig. Thanks for the test repo! Alas, the merge driver gets

Re: Interest in contributing to the Git for GSOC 2015

2015-03-06 Thread Junio C Hamano
Amate Yolande yolandeam...@gmail.com writes: I would like to work on the Unifying git branch -l, git tag -l, and git for-each-ref project for GSOC 2015 and I hope I can get more directives on how to move on with this project. Hmm, the description on the ideas page looks somewhat

Re: Bashing freelancers

2015-03-06 Thread Junio C Hamano
David Kastrup d...@gnu.org writes: Junio C Hamano gits...@pobox.com writes: David Kastrup d...@gnu.org writes: Good work is worth good money. Suggesting that people who are not able to work for free are morally inferior is not conducive for a cooperative work atmosphere. Yes, but I do

Is the Git Mailing List dropping messages?

2015-03-06 Thread Kyle J. McKay
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: Any chance for a Git v2.1.5 release?

Re: [PATCH] protocol upload-pack-v2

2015-03-06 Thread Duy Nguyen
On Sat, Mar 7, 2015 at 11:28 AM, Stefan Beller sbel...@google.com wrote: + + advertised-refs = (no-refs / list-of-refs) + *shallow + flush-pkt I am not sure if defining shallow as part of refs advertisement is a good idea. The latter lives in the

Re: [PATCH] protocol upload-pack-v2

2015-03-06 Thread Stefan Beller
On Fri, Mar 6, 2015 at 4:28 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: @@ -67,7 +74,6 @@ gracefully with an error message. error-line = PKT-LINE(ERR SP explanation-text) - SSH Transport Noise? @@ -124,9 +130,56 @@ has, the first

Promoting Git developers (was: Bashing freelancers)

2015-03-06 Thread Christian Couder
Hi, On Fri, Mar 6, 2015 at 6:41 PM, David Kastrup d...@gnu.org 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 community has not been good especially lately at promoting its

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

2015-03-06 Thread Dongcan Jiang
Because --graph is about connected history while --no-walk is about discrete points. [1] It's a pity that git-show has to allow such combination in order to make t4052-stat-output.sh compatible. [2] 2 testcases have been added to test this patch. [1]:

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

2015-03-06 Thread Dongcan Jiang
Hi all, My name is Dongcan Jiang. I am studying for my Master Degree at Peking University majoring in Computer Science. I have been using Git to manage my projects for about half a year. It's really exciting that Git has been helping me make revision control much more convenient. Therefore, I am

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

2015-03-06 Thread Anton Trunov
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? Current version for git help merge: ... ignore-space-change, ignore-all-space, ignore-space-at-eol

Re: [GSoC microproject] Add XDG support to the credential-store helper

2015-03-06 Thread Paul Tan
Hi Luis, On Fri, Mar 6, 2015 at 7:41 AM, Luis Ressel ara...@aixah.de wrote: Okay, I've had a look at Paul's patch for this. Sorry again for the dupe, I must've missed it before. I guess I'll attempt another microproject. However, I feel like my patch is really all that's neccessary; I don't

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

2015-03-06 Thread Max Kirillov
On Fri, Mar 6, 2015 at 7:08 AM, Akshay Aurora akshayaur...@yahoo.com wrote: Not sure, why this mail is not showing on Gmane. I used git to send the email, and tested it by sending the patch to myself before sending it to the list. Gmail knows: Why is this message in Spam? It has a from address

Re: [PATCH v3] git: make git -C '' cmd not to barf

2015-03-06 Thread Eric Sunshine
On Fri, Mar 6, 2015 at 2:05 AM, Karthik Nayak karthik@gmail.com wrote: It now acts like cd '' and does not barf and treats it as a no-op. What does barf mean in this context? Does the program crash? Spit out nonsensical messages? Misbehave in some fashion? A good commit message should

Re: Bashing freelancers

2015-03-06 Thread David Kastrup
Junio C Hamano gits...@pobox.com writes: David Kastrup d...@gnu.org writes: Junio C Hamano gits...@pobox.com writes: David Kastrup d...@gnu.org writes: Good work is worth good money. Suggesting that people who are not able to work for free are morally inferior is not conducive for a

[PATCH] send-email: Add CCs from additional commit tags

2015-03-06 Thread Soren Brinkmann
Add email addresses from additional commonly used tags to the CC-list of patches. Additional tags are: - Acked-by - Reviewed-by - Tested-by - Reported-by - Reviewed-and-tested-by --suppress-cc=ack suppresses these additional CCs. Signed-off-by: Soren Brinkmann soren.brinkm...@xilinx.com ---