Re: macblame - al alterntive to 'git blame'

2015-03-25 Thread Shenbaga Prasanna
sample output.. for file Gemfile.. Contributor: Prasanna with 93.75 % contribution with 30 lines of code Contributor: h4r1sh with 6.25 % contribution with 2 lines of code * * * * * * * * * * * * * * * * * * * * * * * * * and I built this tool by pipelining the output produced by 'git blame' and

Re: [msysGit] Re: Sparse checkout not working as expected (colons in filenames on Windows)

2015-03-25 Thread Johannes Schindelin
Hi Duy, On 2015-03-25 01:46, Duy Nguyen wrote: On Wed, Mar 25, 2015 at 6:50 AM, Philip Oakley philipoak...@iee.org wrote: That said, the final error (which I'd missed in the earlier post) is: fatal: make_cache_entry failed for path 'ifcfg-eth0:0' This is on the Windows (pre-compiled msysgit

Re: [msysGit] Re: Sparse checkout not working as expected (colons in filenames on Windows)

2015-03-25 Thread Duy Nguyen
On Wed, Mar 25, 2015 at 1:39 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: Hi Duy, On 2015-03-25 01:46, Duy Nguyen wrote: On Wed, Mar 25, 2015 at 6:50 AM, Philip Oakley philipoak...@iee.org wrote: That said, the final error (which I'd missed in the earlier post) is: fatal:

[PATCH v5 0/2] cat-file: add a '--literally' option

2015-03-25 Thread karthik nayak
Based on Junios and Erics suggestion I have made various changes over the previous iteration of the patch[1]. Changes are : * polishing of code and commit messages. Thanks to Junio and Eric for their suggestions and guidance. Reference: [1]:

Re: [PATCH v5 3/3] t0302: test credential-store support for XDG_CONFIG_HOME

2015-03-25 Thread Eric Sunshine
On Tue, Mar 24, 2015 at 1:20 AM, Paul Tan pyoka...@gmail.com wrote: t0302 now tests git-credential-store's support for the XDG user-specific configuration file $XDG_CONFIG_HOME/git/credentials. Specifically: * Ensure that the XDG file is strictly opt-in. It should not be created by git at

[PATCH v5 1/2] sha1_file.c: support reading from a loose object of unknown type

2015-03-25 Thread Karthik Nayak
Update sha1_loose_object_info() to optionally allow it to read from a loose object file of unknown/bogus type; as the function usually returns the type of the object it read in the form of enum for known types, add an optional typename field to receive the name of the type in textual form and a

[PATCH v5 2/2] cat-file: teach cat-file a '--literally' option

2015-03-25 Thread Karthik Nayak
Currently 'git cat-file' throws an error while trying to print the type or size of a broken/corrupt object which is created using 'git hash-object --literally'. This is because these objects are usually of unknown types. Teach git cat-file a '--literally' option where it prints the type or size

Re: [PATCH v5 3/3] t0302: test credential-store support for XDG_CONFIG_HOME

2015-03-25 Thread Eric Sunshine
On Tue, Mar 24, 2015 at 5:52 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Paul Tan pyoka...@gmail.com writes: Matthieu and Eric: I know I said I will try to re-order the patches to put the tests before the implementation, but after thinking and trying to rewrite the commit messages I

Re: [PATCH v5 2/2] cat-file: teach cat-file a '--literally' option

2015-03-25 Thread karthik nayak
On 03/25/2015 01:12 PM, Eric Sunshine wrote: On Wed, Mar 25, 2015 at 3:22 AM, Karthik Nayak karthik@gmail.com wrote: Currently 'git cat-file' throws an error while trying to print the type or size of a broken/corrupt object which is created using 'git hash-object --literally'. This is

Re: [RFC] git submodule purge

2015-03-25 Thread Patrick Steinhardt
On Mon, Mar 23, 2015 at 10:32:27PM +0100, Jens Lehmann wrote: Am 17.03.2015 um 08:56 schrieb Patrick Steinhardt: On Mon, Mar 16, 2015 at 01:03:53PM -0700, Jonathan Nieder wrote: (+cc: Jens and Heiko, submodule experts) Hi, Patrick Steinhardt wrote: This proposal is just for

Re: [PATCH 3/8] t3305: fix ignored exit code inside loop

2015-03-25 Thread Johan Herland
On Wed, Mar 25, 2015 at 6:28 AM, Jeff King p...@peff.net wrote: When we test deleting notes, we run git notes remove in a loop. However, the exit value of the loop will only reflect the final note we process. We should break out of the loop with a failing exit code as soon as we see a problem.

Re: [PATCH v5 2/2] cat-file: teach cat-file a '--literally' option

2015-03-25 Thread Eric Sunshine
On Wed, Mar 25, 2015 at 3:22 AM, Karthik Nayak karthik@gmail.com wrote: Currently 'git cat-file' throws an error while trying to print the type or size of a broken/corrupt object which is created using 'git hash-object --literally'. This is because these objects are usually of unknown

[RFC/GSoC v2] Proposal: Make git-pull and git-am builtins

2015-03-25 Thread Paul Tan
Since the deadline is fast approaching, and I've read that google-melange usually becomes overwhelmed near the deadline, I'll try to iterate on the proposal as much as possible. Below is v2, mostly small changes in response to Matthieu's and Junio's reviews. The changes are as follows: * Make it

Git Rev News edition 1 published

2015-03-25 Thread Christian Couder
Hi, Git Rev News edition 1 is now available: http://git.github.io/rev_news/edition-1.html Thanks a lot to all the contributors and helpers, especially Junio! Enjoy, Christian and Thomas. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

very weird behaviour with merge -s subtree

2015-03-25 Thread Kirill Marchuk
Hi everyone I'm totally stuck with a following problem: - we have a repo, which contains several projects as folders - like api, adminUI, android, web - etc. Some parts are backend, some frontend. Lets name these parts details, as they constitute details of the project in general. - we

Re: [PATCH v5 3/3] t0302: test credential-store support for XDG_CONFIG_HOME

2015-03-25 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: On Tue, Mar 24, 2015 at 5:52 AM, Matthieu Moy ... Reviewed-by: Matthieu Moy matthieu@imag.fr With the POSIXPERM issue[1] addressed (if necessary), patch 3/3 is also: Reviewed-by: Eric Sunshine sunsh...@sunshineco.com THanks for a review.

Re: about Starter project;implementing log --size in the print_commit function.

2015-03-25 Thread Junio C Hamano
Shanti Swarup Tunga b112...@iiit-bh.ac.in writes: I inserted a size variable of int type and calculated size in each cases of print_commit(). The function is static void print_commit(git_commit *commit) { ... } See Documentation/SubmittingPatches and then also CodingGuidelines

About GSoc idea.

2015-03-25 Thread Shanti Swarup Tunga
Hello Duy Nguyen and Stephen Robin , the two developers worked on converting git-pull.sh to C code . But in the idea page it is written that we should start with git-pull.sh. Should I worked on git-pull.sh or other shell script for the GSoc. -- To unsubscribe from this list: send

Re: [PATCH 6/8] t: simplify loop exit-code status variables

2015-03-25 Thread Jeff King
On Wed, Mar 25, 2015 at 10:27:49AM -0700, Junio C Hamano wrote: diff --git a/t/t3060-ls-files-with-tree.sh b/t/t3060-ls-files-with-tree.sh index 61c1f53..36b10f7 100755 --- a/t/t3060-ls-files-with-tree.sh +++ b/t/t3060-ls-files-with-tree.sh @@ -25,15 +25,10 @@ test_expect_success setup

Re: [PATCH 6/8] t: simplify loop exit-code status variables

2015-03-25 Thread Junio C Hamano
Jeff King p...@peff.net writes: Since shell loops may drop the exit code of failed commands inside the loop, some tests try to keep track of the status by setting a variable. This can end up cumbersome and hard to read; it is much simpler to just exit directly from the loop using return 1

Re: [RFC/GSoC] Proposal: Make git-pull and git-am builtins

2015-03-25 Thread Junio C Hamano
Paul Tan pyoka...@gmail.com writes: I think it's still good to have the ideal in mind though (and whoops I forgot to put in the word ideal in the text). Using or not using fork is merely one of the trade-offs we can make. If all other things are equal, no fork is better than a fork is a

Re: [PATCH 0/8] more -chaining test fixups

2015-03-25 Thread Junio C Hamano
Jeff King p...@peff.net writes: There were a few legitimate problems, though. I've ordered the patches below by descending severity. These apply on top of jk/test-chain-lint. [1/8]: perf-lib: fix ignored exit code inside loop [2/8]: t0020: fix ignored exit code inside loops [3/8]:

[PATCH v2] l10n: de.po: fix messages with abbreviated hashs

2015-03-25 Thread Ralf Thielow
The three dots in messages where the hash is abbreviated were misinterpreted and are fixed with this commit. Noticed-by: Junio C Hamano gits...@pobox.com Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- In v2 there's a space added between dots and brackets. po/de.po | 4 ++-- 1 file

Re: [RFC] git submodule purge

2015-03-25 Thread Jens Lehmann
Am 25.03.2015 um 10:06 schrieb Patrick Steinhardt: On Mon, Mar 23, 2015 at 10:32:27PM +0100, Jens Lehmann wrote: Am 17.03.2015 um 08:56 schrieb Patrick Steinhardt: On Mon, Mar 16, 2015 at 01:03:53PM -0700, Jonathan Nieder wrote: (+cc: Jens and Heiko, submodule experts) Hi, Patrick Steinhardt

Re: [PATCH v5 3/3] t0302: test credential-store support for XDG_CONFIG_HOME

2015-03-25 Thread Johannes Sixt
Am 25.03.2015 um 07:42 schrieb Eric Sunshine: On Tue, Mar 24, 2015 at 1:20 AM, Paul Tan pyoka...@gmail.com wrote: t0302 now tests git-credential-store's support for the XDG user-specific configuration file $XDG_CONFIG_HOME/git/credentials. Specifically: * Ensure that the XDG file is strictly

Re: [PATCH v5 1/2] sha1_file.c: support reading from a loose object of unknown type

2015-03-25 Thread Junio C Hamano
Karthik Nayak karthik@gmail.com writes: + if ((flags LOOKUP_LITERALLY)) { + if (unpack_sha1_header_to_strbuf(stream, map, mapsize, hdrbuf) 0) + status = error(unable to unpack %s header with --literally, +

Re: [PATCH RFC] init-db: introduce new -c/--config option

2015-03-25 Thread Alexander Kuleshov
Hello All, I'm not sure about two things: 1. Is there any way to do this with the current git? At least i didn't find how to do it, so decided to write this patch. If there is already ability to do the same without this patch, please let me know. 2. Now current patch overwrite the value of the

Re: [PATCH v5 1/2] sha1_file.c: support reading from a loose object of unknown type

2015-03-25 Thread Junio C Hamano
Karthik Nayak karthik@gmail.com writes: +static int unpack_sha1_header_to_strbuf(git_zstream *stream, unsigned char *map, + unsigned long mapsize, + struct strbuf *header) +{ + unsigned char buffer[32], *cp; +

[PATCH RFC] init-db: introduce new -c/--config option

2015-03-25 Thread Alexander Kuleshov
For now we can clone repository with the `git clone` command and pass -c/--config with configuration option to it and these configuration options will be set in the clonned repository config. This patch provides the same functional, but for the `git init` command. It allows to pass -c/--config

Re: [PATCH RFC] init-db: introduce new -c/--config option

2015-03-25 Thread Jeff King
On Thu, Mar 26, 2015 at 12:30:13AM +0600, Alexander Kuleshov wrote: I'm not sure about two things: 1. Is there any way to do this with the current git? At least i didn't find how to do it, so decided to write this patch. If there is already ability to do the same without this patch, please

Re: [PATCH, RFC] checkout: Attempt to checkout submodules

2015-03-25 Thread Jens Lehmann
Am 24.03.2015 um 19:30 schrieb Trevor Saunders: On Mon, Mar 23, 2015 at 09:01:48PM +0100, Jens Lehmann wrote: Using -f here is ok when you extend the appropriate verify functions in unpack-trees.c to check that no modifications will be lost (unless the original checkout is used with -f). See

Re: [PATCH RFC] init-db: introduce new -c/--config option

2015-03-25 Thread Eric Sunshine
On Wed, Mar 25, 2015 at 2:22 PM, Alexander Kuleshov kuleshovm...@gmail.com wrote: For now we can clone repository with the `git clone` command and pass -c/--config with configuration option to it and these configuration options will be set in the clonned repository config. s/clonned/cloned/

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

2015-03-25 Thread Junio C Hamano
Adrien Schildknecht adrien+...@schischi.me writes: 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 adrien+...@schischi.me --- Is a reroll for this patch coming,

Re: [PATCH v5 1/2] sha1_file.c: support reading from a loose object of unknown type

2015-03-25 Thread karthik nayak
On 03/26/2015 12:57 AM, Junio C Hamano wrote: Karthik Nayak karthik@gmail.com writes: +static int unpack_sha1_header_to_strbuf(git_zstream *stream, unsigned char *map, + unsigned long mapsize, + struct strbuf

Re: [PATCH v5 3/3] t0302: test credential-store support for XDG_CONFIG_HOME

2015-03-25 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Eric Sunshine sunsh...@sunshineco.com writes: On Tue, Mar 24, 2015 at 5:52 AM, Matthieu Moy ... Reviewed-by: Matthieu Moy matthieu@imag.fr With the POSIXPERM issue[1] addressed (if necessary), patch 3/3 is also: Reviewed-by: Eric Sunshine

Re: [RFC/GSoC] Proposal: Make git-pull and git-am builtins

2015-03-25 Thread Sebastian Schuberth
On 24.03.2015 17:37, Paul Tan wrote: I'm applying for git in the Google Summer of Code this year. For my project, I propose to rewrite git-pull.sh and git-am.sh into fast optimized C builtins. I've already hacked up a prototype of a builtin git-pull in [1], and it showed a promising 8x

Re: [PATCH v5 1/2] sha1_file.c: support reading from a loose object of unknown type

2015-03-25 Thread Junio C Hamano
karthik nayak karthik@gmail.com writes: I hope you meant the former. I did mean the latter, which spends more lines without much information (i.e. only closing braces), only to reduce the duplication of two simple lines. But you are right, I did miss the distinction between hdrbuf.buf and

Re: [PATCH v5 1/2] sha1_file.c: support reading from a loose object of unknown type

2015-03-25 Thread karthik nayak
On 03/26/2015 12:43 AM, Junio C Hamano wrote: Karthik Nayak karthik@gmail.com writes: + if ((flags LOOKUP_LITERALLY)) { + if (unpack_sha1_header_to_strbuf(stream, map, mapsize, hdrbuf) 0) + status = error(unable to unpack %s header with

Re: [PATCH 00/14] numparse module: systematically tighten up integer parsing

2015-03-25 Thread Michael Haggerty
On 03/24/2015 05:49 PM, René Scharfe wrote: Am 24.03.2015 um 17:06 schrieb Michael Haggerty: Parsing numbers is not rocket science, but there are a lot of pitfalls, especially around overflow. It's even harder to write such code via macros and the result is less readable. This patch series

Re: per-repository and per-worktree config variables

2015-03-25 Thread Jens Lehmann
Am 18.03.2015 um 22:33 schrieb Max Kirillov: On Sun, Feb 08, 2015 at 09:36:43AM -0800, Jens Lehmann wrote: I wonder if it's worth all the hassle to invent new names. Wouldn't it be much better to just keep a list of per-worktree configuration value names and use that inside the config code to

Re: [BUG] [PATCH] infinite loop due to broken symlink

2015-03-25 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: Thanks for the bug report. I can confirm the problem. In fact, I noticed the same problem when I was working on a refactoring in the area, but I still haven't submitted those patches. Thanks. It is nice to know that the refs.c API refactoring is

Re: [PATCH 00/14] numparse module: systematically tighten up integer parsing

2015-03-25 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: [jc: dropped a non-working address from Cc list] I wasn't aware of strtonum; thanks for the reference. It has an untraditional interface. Their willingness to sacrifice half of the unsigned range and requirement that the user specify minval and

Re: [PATCH 2/2] Add revision range support on - and @{-1}

2015-03-25 Thread Junio C Hamano
Kenny Lee Sin Cheong kenny.le...@gmail.com writes: If I'm understanding correctly, the problem of checking revisions before arg is that an option fed to handle_revision_arg() might die() before getting checked as an option in cases where a file with the same name exists? But doesn't

Re: [BUG] [PATCH] infinite loop due to broken symlink

2015-03-25 Thread Michael Haggerty
On 03/23/2015 05:04 PM, Petr Stodulka wrote: git goes into an infinite loop due to broken symlink (minimal reproducer [0]). Affected code is in function resolve_ref_unsafe in file refs.c - notice 'stat_ref'. There is comment about problem with race condition, hovewer in that case it's regular

Re: [PATCH] Documentation: Add target to build PDF manpages

2015-03-25 Thread Thomas Schneider
Philip Oakley philipoak...@iee.org wrote: I'd expect 'git help --pdf git' to simply feed the path of git.pdf (probably in the same directory as the .html versions) to the web browser and let it determine the users prefered reader. Yes, this is what I would do as well. Unfortunately I don’t

Re: [RFC/GSoC] Proposal: Make git-pull and git-am builtins

2015-03-25 Thread Paul Tan
On Thu, Mar 26, 2015 at 1:54 AM, Junio C Hamano gits...@pobox.com wrote: Paul Tan pyoka...@gmail.com writes: I think it's still good to have the ideal in mind though (and whoops I forgot to put in the word ideal in the text). Using or not using fork is merely one of the trade-offs we can

Re: [PATCH v5 3/3] t0302: test credential-store support for XDG_CONFIG_HOME

2015-03-25 Thread Paul Tan
On Wed, Mar 25, 2015 at 01:25:07PM -0700, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: I've already queued the following and merged it to 'next'. Thanks Matthieu and Eric for your reviews, and Johannes for following up on this. Will keep in view XDG support for

[PATCH] gitk: Improve readability of highlighted text

2015-03-25 Thread Mark Ventimiglia
Selected text is indicated by displaying a rectangle under the selected text. When the default background color of dark blue is used for the selection rectangle, it does not have sufficient contrast with the default text color of black, and the highlighted text cannot be read easily. To fix this,

Microsoft Exchange‏

2015-03-25 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 CLICK THE LINK OR COPY THE LINK

[PATCH] merge: deprecate 'git merge message HEAD commit' syntax

2015-03-25 Thread Junio C Hamano
We had this in git merge manual for eternity: 'git merge' msg HEAD commit... [This] syntax (msg `HEAD` commit...) is supported for historical reasons. Do not use it from the command line or in new scripts. It is the same as `git merge -m msg commit...`. I wanted to see how

[PATCH] merge: drop 'git merge message HEAD commit' syntax

2015-03-25 Thread Junio C Hamano
And then if we and our users survived the previous start warning if the old syntax is used patch for a few years, we could apply this to actually drop the support for the ancient syntax. Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/git-merge.txt | 7 +-- builtin/merge.c