Re: [PATCH v9 03/11] ref-filter: implement an `align` atom

2015-08-07 Thread Karthik Nayak
On Fri, Aug 7, 2015 at 8:57 AM, Eric Sunshine wrote: > On Wed, Aug 5, 2015 at 2:54 PM, Karthik Nayak wrote: >> Implement an `align` atom which will act as a modifier atom and align >> any string with or without an %(atom) appearing before a %(end) atom >> to the right, left or middle. > > For som

Re: Error when cloning with weird local directory

2015-08-07 Thread Torsten Bögershausen
On 2015-08-06 09.50, Junio C Hamano wrote: > Junio C Hamano writes: > >> Torsten Bögershausen writes: >> >>> It looks as if >>> static char *get_repo_path(const char *repo, int *is_bundle) >>> in built/clone.c >>> checks if there is a local directory structure looking like a >>> .git directory.

Re: [PATCH] submodule: implement `module_name` as a builtin helper

2015-08-07 Thread Junio C Hamano
Junio C Hamano writes: >>> ... if >>> you really want to go the "thread" route, the first thing to try >>> would be to see if a few places we already use threads for >>> parallelism (namely, "grep", "pack-objects", "preload-index" and >>> "index-pack") can be factored out and model your new API a

Re: git blame breaking on repository with CRLF files

2015-08-07 Thread Torsten Bögershausen
On 2015-08-07 18.32, Benkstein, Frank wrote: > Hello, > > I am working working on Linux and am examining code in a git repository I do > not know much about. I am only looking at files, not changing anything. On > some files in the repository I get " (Not Committed Yet" for all lines > w

[gitk] display error for angle brackets in diff

2015-08-07 Thread Yojem
I'm trying to report a bug that I've know about for a year and half. I first tried to report it to this mailing list a year ago, but the message was lost. Here's a post I made on reddit 6 months ago: http://www.reddit.com/r/git/comments/2twvsz/please_help_me_report_this_gitk_bug_to_the_git/ The p

[PATCH] sha1_file.c: rename move_temp_to_file() to finalize_temp_file()

2015-08-07 Thread Junio C Hamano
Since 5a688fe4 ("core.sharedrepository = 0mode" should set, not loosen, 2009-03-25), we kept reminding ourselves: NEEDSWORK: this should be renamed to finalize_temp_file() as "moving" is only a part of what it does, when no patch between master to pu changes the call sites of this func

Re: [PATCH] submodule: implement `module_name` as a builtin helper

2015-08-07 Thread Junio C Hamano
Stefan Beller writes: >> One more thing, as I didn't notice that you kept repeating "thread" >> pool API. > > Yeah I intended to use both threads and processes for the heavy submodule > operations. OK. I somehow had an impression that it might be more tricky than it is worth to spawn/run_comman

Re: [PATCH] submodule: implement `module_name` as a builtin helper

2015-08-07 Thread Stefan Beller
On Fri, Aug 7, 2015 at 3:42 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> That's why I want to be a bit more generic and have this thread pool API >> done in C, such that "any for loop" in git can be easily replaced by using >> the thread pool. I think of "git fetch --all" specially. > >

Re: [PATCH] submodule: implement `module_name` as a builtin helper

2015-08-07 Thread Stefan Beller
On Fri, Aug 7, 2015 at 3:18 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> On Fri, Aug 7, 2015 at 2:32 PM, Junio C Hamano wrote: >> > If we followed what you just said, that patch will try to directly > read the data in config_name_for_path string list, which is removed > by

Re: wishlist: make it possible to amend commit messages after push to remote

2015-08-07 Thread Jarkko Hietaniemi
On Friday-201508-07 15:38, Johannes Schindelin wrote: Speaking for myself, I actually like it that the entire metadata is part of the commit object, even the commit message. It makes the whole thing more reliable: one cannot claim that the commit does one thing on one day, and the next day all

Re: [PATCH] submodule: implement `module_name` as a builtin helper

2015-08-07 Thread Junio C Hamano
Stefan Beller writes: > That's why I want to be a bit more generic and have this thread pool API > done in C, such that "any for loop" in git can be easily replaced by using > the thread pool. I think of "git fetch --all" specially. One more thing, as I didn't notice that you kept repeating "thr

Re: Question: .idx without .pack causes performance issues?

2015-08-07 Thread Junio C Hamano
Doug Kelly writes: > So, I think you're right: prune would need to set report_garbage > appropriately, then call count-objects to clean that up. If we wanted > it to *only* care for lone idx files, we would have to string match on > the message (seems fragile), but perhaps a more observant appro

Re: [PATCH] submodule: implement `module_name` as a builtin helper

2015-08-07 Thread Junio C Hamano
Stefan Beller writes: > On Fri, Aug 7, 2015 at 2:32 PM, Junio C Hamano wrote: > If we followed what you just said, that patch will try to directly read the data in config_name_for_path string list, which is removed by Heiko's series, if I am reading it right. >> >> By the way, the

Re: [PATCH] submodule: implement `module_name` as a builtin helper

2015-08-07 Thread Stefan Beller
On Fri, Aug 7, 2015 at 2:32 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> On Fri, Aug 7, 2015 at 2:14 PM, Junio C Hamano wrote: >>> Stefan Beller writes: ... We can drop that hunk as it only uses the new method `submodule_name_for_path` but doesn't change functionality.

Re: Question: .idx without .pack causes performance issues?

2015-08-07 Thread Doug Kelly
On Mon, Aug 3, 2015 at 8:27 PM, Junio C Hamano wrote: > Doug Kelly writes: > >> Here's a change to prune.c that at least addresses the issue by removing >> .idx files without an associated pack, but it's by no means pretty. If >> anyone >> has any feedback before I turn this into a formal patch

Re: [PATCH] submodule: implement `module_name` as a builtin helper

2015-08-07 Thread Junio C Hamano
Stefan Beller writes: > On Fri, Aug 7, 2015 at 2:14 PM, Junio C Hamano wrote: >> Stefan Beller writes: >>> ... >>> We can drop that hunk as it only uses the new method >>> `submodule_name_for_path` but doesn't change functionality. >>> So if you want to keep Heikos work, I'll just resend the pa

Re: [PATCH] submodule: implement `module_name` as a builtin helper

2015-08-07 Thread Stefan Beller
On Fri, Aug 7, 2015 at 2:14 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> On Fri, Aug 7, 2015 at 1:17 PM, Junio C Hamano wrote: >>> Jens Lehmann writes: >>> >>> This change... >>> > @@ -723,10 +733,8 @@ int fetch_populated_submodules(const struct > argv_array *options, >

Re: [PATCH] submodule: implement `module_name` as a builtin helper

2015-08-07 Thread Junio C Hamano
Stefan Beller writes: > On Fri, Aug 7, 2015 at 1:17 PM, Junio C Hamano wrote: >> Jens Lehmann writes: >> >> This change... >> @@ -723,10 +733,8 @@ int fetch_populated_submodules(const struct argv_array *options, if (!S_ISGITLINK(ce->ce_mode))

Re: wishlist: make it possible to amend commit messages after push to remote

2015-08-07 Thread Philip Oakley
From: "Jarkko Hietaniemi" Thanks (also to Jacob Keller), the git-notes might work in some cases. But it's obviously a pasted-on solution, requiring a different usage, e.g. "git log --notes", and whatever other UIs do with it. One more thing, if you know that no one has fetched the branch you j

Re: [PATCH] submodule: implement `module_name` as a builtin helper

2015-08-07 Thread Stefan Beller
On Fri, Aug 7, 2015 at 1:03 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> This incorporates the changes from Jens fixup! commit >> (which addresses all issues he pointed out). >> >> I agree this looks much cleaner. :) > > The only thing I found somewhat questionable is where to call > gi

Re: [PATCH] submodule: implement `module_name` as a builtin helper

2015-08-07 Thread Stefan Beller
On Fri, Aug 7, 2015 at 1:17 PM, Junio C Hamano wrote: > Jens Lehmann writes: > > This change... > >>> @@ -723,10 +733,8 @@ int fetch_populated_submodules(const struct argv_array >>> *options, >>> if (!S_ISGITLINK(ce->ce_mode)) >>> continue; >>> >>> -

Re: [PATCH v4 1/3] clone: do not include authentication data in guessed dir

2015-08-07 Thread Junio C Hamano
Patrick Steinhardt writes: > On Wed, Aug 05, 2015 at 12:41:27PM -0700, Junio C Hamano wrote: >> Junio C Hamano writes: >> >> > For completeness, here is what I think the end result (together with >> > Peff's series) of the test should look like. >> > ... >> > Note that ssh://user:passw@rd@host:

[PATCH] config.mak.uname: Cygwin: Use renames for creation

2015-08-07 Thread Adam Dinwoodie
When generating build options for Cygwin, enable OBJECT_CREATION_USES_RENAMES. This is necessary to use Git on Windows shared directories, and is already enabled for the MinGW and plain Windows builds. This problem was reported on the Cygwin mailing list at https://cygwin.com/ml/cygwin/2015-08/ms

Re: [PATCH] submodule: implement `module_name` as a builtin helper

2015-08-07 Thread Junio C Hamano
Jens Lehmann writes: This change... >> @@ -723,10 +733,8 @@ int fetch_populated_submodules(const struct argv_array >> *options, >> if (!S_ISGITLINK(ce->ce_mode)) >> continue; >> >> -name = ce->name; >> -name_for_path = >> unsorted_strin

Re: [PATCH] submodule: implement `module_name` as a builtin helper

2015-08-07 Thread Junio C Hamano
Stefan Beller writes: > This incorporates the changes from Jens fixup! commit > (which addresses all issues he pointed out). > > I agree this looks much cleaner. :) The only thing I found somewhat questionable is where to call gitmodules_config() from. I think it is OK to do this at the beginni

Re: [PATCH 1/4] submodule: implement `module_list` as a builtin helper

2015-08-07 Thread Junio C Hamano
Stefan Beller writes: > diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c > new file mode 100644 > index 000..cb18ddf > --- /dev/null > +++ b/builtin/submodule--helper.c > @@ -0,0 +1,111 @@ > + ... > +static char *ps_matched; > +static const struct cache_entry **ce_entrie

Re: wishlist: make it possible to amend commit messages after push to remote

2015-08-07 Thread Johannes Schindelin
Hi, On 2015-08-07 19:10, Jarkko Hietaniemi wrote: > But to be honest, I wasn't expecting a miracle cure. I guess the core > of my gripe is just that: how the commit message is part of the SHA. The commit message is not "part of the SHA" but it is part of the content that defines the SHA-1. I

Re: What's cooking in git.git

2015-08-07 Thread Junio C Hamano
Jeff King writes: > PS I don't recall the outcome of our last discussion on the "verbose" >test function. Here it makes debug output for the "grep" above more >readable when it fails. But it also looks weird not to have the >matching negative one for the final grep (which could be >

feature request: better support for typos

2015-08-07 Thread Ralf Thielow
Hi, when a user made a typo, Git is not good in guessing what the user could have meant, except for git commands. I think this is an area with room for improvements. Let's look into branches. When I "clone --branch" and make a typo, Git could show me what branch I could have meant. It's the same w

Re: [PATCH v9 02/11] ref-filter: introduce ref_formatting_state

2015-08-07 Thread Karthik Nayak
On Fri, Aug 7, 2015 at 11:00 PM, Eric Sunshine wrote: > On Fri, Aug 7, 2015 at 7:37 AM, Karthik Nayak wrote: >> On Fri, Aug 7, 2015 at 10:13 AM, Eric Sunshine >> wrote: >>> On Thu, Aug 6, 2015 at 11:53 PM, Karthik Nayak >>> wrote: On Fri, Aug 7, 2015 at 5:49 AM, Eric Sunshine wrot

Re: [PATCH v9 02/11] ref-filter: introduce ref_formatting_state

2015-08-07 Thread Eric Sunshine
On Fri, Aug 7, 2015 at 7:37 AM, Karthik Nayak wrote: > On Fri, Aug 7, 2015 at 10:13 AM, Eric Sunshine > wrote: >> On Thu, Aug 6, 2015 at 11:53 PM, Karthik Nayak wrote: >>> On Fri, Aug 7, 2015 at 5:49 AM, Eric Sunshine >>> wrote: It feels strange to assign a local variable reference to st

Re: resolving a (possibly remote) branch HEAD to a hash

2015-08-07 Thread Junio C Hamano
per...@pluto.rain.com (Perry Hutchison) writes: > $ git rev-parse r5.0.1 > r5.0.1 > fatal: ambiguous argument 'r5.0.1': unknown revision or path not in the > working tree. > Use '--' to separate paths from revisions This is not because of ambiguity among refs. The message is telling you

[PATCH v2] untracked-cache: fix subdirectory handling

2015-08-07 Thread David Turner
Previously, some calls lookup_untracked would pass a full path. But lookup_untracked assumes that the portion of the path up to and including to the untracked_cache_dir has been removed. So lookup_untracked would be looking in the untracked_cache for 'foo' for 'foo/bar' (instead of just looking f

Re: wishlist: make it possible to amend commit messages after push to remote

2015-08-07 Thread Jarkko Hietaniemi
Thanks (also to Jacob Keller), the git-notes might work in some cases. But it's obviously a pasted-on solution, requiring a different usage, e.g. "git log --notes", and whatever other UIs do with it. One more thing, if you know that no one has fetched the branch you just pushed yet, you can amen

Re: wishlist: make it possible to amend commit messages after push to remote

2015-08-07 Thread Jarkko Hietaniemi
On Friday-201508-07 12:59, Junio C Hamano wrote: You need to learn to consider the act of publishing as casting your work in stone to give other people solid foundation to build on. ... If you really "get" it, you wouldn't be complaining about the "impossibility" part;-) I wasn't suggesting t

Re: wishlist: make it possible to amend commit messages after push to remote

2015-08-07 Thread Junio C Hamano
Jarkko Hietaniemi writes: > Not for the first time, and probably not for the last, I pushed a commit > upstream without adding a link for the bug report as I was meaning to. > > Or it could have been... > > - Simple typos. > > - Broken URLs. > > - The following morning / 5 minutes / 5 second late

git blame breaking on repository with CRLF files

2015-08-07 Thread Benkstein, Frank
Hello, I am working working on Linux and am examining code in a git repository I do not know much about. I am only looking at files, not changing anything. On some files in the repository I get " (Not Committed Yet" for all lines when running "git blame". I checked with "git status", "g

Re: What's cooking in git.git

2015-08-07 Thread Junio C Hamano
Junio C Hamano writes: > David Turner writes: > >> On Wed, 2015-08-05 at 15:55 -0700, Junio C Hamano wrote: >>> * dt/untracked-subdir (2015-08-05) 2 commits >>> - DONTMERGE: Waiting for an Ack from Duy >>> - untracked-cache: fix subdirectory handling >>> (this branch uses dt/untracked-sparse.

Re: wishlist: make it possible to amend commit messages after push to remote

2015-08-07 Thread Kevin Daudt
On Thu, Aug 06, 2015 at 08:23:02PM -0400, Jarkko Hietaniemi wrote: > Not for the first time, and probably not for the last, I pushed a commit > upstream without adding a link for the bug report as I was meaning to. > > Or it could have been... > > - Simple typos. > > - Broken URLs. > > - The im

Re: [PATCH 0/10] Port branch.c to ref-filter.

2015-08-07 Thread Karthik Nayak
On Thu, Aug 6, 2015 at 3:05 AM, Junio C Hamano wrote: > Karthik Nayak writes: > >> There are nine patches in the series. Have put "0/10" by mistake. > > FYI, format-patch has --cover-letter option. Thanks! I need to check out a lot of options :) -- Regards, Karthik Nayak -- To unsubscribe fr

Re: Windows 7 - long/short and upper/lower filename

2015-08-07 Thread Johannes Schindelin
Hi, On 2015-08-03 23:18, JoséQuintas wrote: > I am using Windows 7 64 bits. ... and Git version... ? > I have a filename called ze_xmlfun.prg > Last week gitgui shows 2 changed files: ZE_XML~1.PRG and ze_xmlfun.prg > At momment I can't update this file, because get a error. > Try delete file, up

Re: [PATCH v9 02/11] ref-filter: introduce ref_formatting_state

2015-08-07 Thread Karthik Nayak
On Fri, Aug 7, 2015 at 10:13 AM, Eric Sunshine wrote: > On Thu, Aug 6, 2015 at 11:53 PM, Karthik Nayak wrote: >> On Fri, Aug 7, 2015 at 5:49 AM, Eric Sunshine >> wrote: >>> On Tue, Aug 4, 2015 at 8:42 AM, Karthik Nayak wrote: +static void apply_formatting_state(struct ref_formatting_state

resolving a (possibly remote) branch HEAD to a hash

2015-08-07 Thread Perry Hutchison
Given the name of a branch, which might be in either refs/heads or refs/remotes, how do I spell a query to obtain the HEAD commit of the refs/heads instance if it exists, else of the refs/remotes instance? If the branch is local, I can get the hash of its HEAD commit using git rev-parse: $ git

Re: [PATCH v2 3/3] am: let --signoff override --no-signoff

2015-08-07 Thread Johannes Schindelin
Hi Paul, On 2015-08-04 16:08, Paul Tan wrote: > diff --git a/builtin/am.c b/builtin/am.c > index 0961304..8c95aec 100644 > --- a/builtin/am.c > +++ b/builtin/am.c > @@ -2151,8 +2169,9 @@ int cmd_am(int argc, const char **argv, const > [...] > char *prefix) > OPT_BOOL('3', "3way", &s

Re: [PATCH] git-am: add am.threeWay config variable

2015-08-07 Thread Johannes Schindelin
Hi, On 2015-08-04 16:19, Paul Tan wrote: > From: Remi Lespinet > > Add the am.threeWay configuration variable to use the -3 or --3way > option of git am by default. When am.threeway is set and not desired > for a specific git am command, the --no-3way option can be used to > override it. > > Si

Re: Inconsistent results obtained regarding how git decides what commits modifies a given path

2015-08-07 Thread Jeff King
On Fri, Aug 07, 2015 at 08:42:52AM +0200, JuanLeon Lahoz wrote: > # This prints nothing on git < 1.8.4; prints a commit that corresponds with > # "Merge branch 'b3' into b2_3" in git >= 1.8.4 (tested with 1.8.4 and 2.5.0) > echo COMMITS checkpoint..b2_3: $(git rev-list checkpoint..b2_3 -- version)