Re: Big repo not shrinking on repack or gc?

2015-01-14 Thread Andreas Krey
On Thu, 15 Jan 2015 18:05:46 +, Bryan Turner wrote: ... > No, Stash will only do that in a repository which has been forked. In > any non-forked repository, Stash does not interact with garbage > collection in any way. Auto GC is left enabled, and all pruning > settings are left at their defaul

Re: [PATCH 00/10] mark private symbols static

2015-01-14 Thread Jeff King
On Wed, Jan 14, 2015 at 03:40:45PM -0800, Junio C Hamano wrote: > Here are a handful of patches to make symbols that are only used > within a .c file as static. This is not the kind of changes we > would want to do in the pre-release freeze period, and it is just > for reference. I may later com

Re: [PATCH 10/10] commit: show "Author:" hint when the ident is not given explicitly

2015-01-14 Thread Jeff King
On Wed, Jan 14, 2015 at 03:40:55PM -0800, Junio C Hamano wrote: > This is a knee-jerk response to two facts: > > - the author_ident_sufficiently_given() function is public but >nobody uses it; > > - a corresponding function committer_ident_sufficiently_given() is >used to determine whe

Re: Big repo not shrinking on repack or gc?

2015-01-14 Thread Bryan Turner
On Thu, Jan 15, 2015 at 5:38 PM, Andreas Krey wrote: > On Thu, 15 Jan 2015 12:23:00 +, Bryan Turner wrote: > ... >> > Guess in the dark: "ls -l .git/objects/pack" >> > Do you see any .keep files? > > Lots of. :-( > >> I'm one of the Stash developers and just noticed this thread. If the >> repo

Re: [PATCH 08/10] pack-bitmap.c: make pack_bitmap_filename() static

2015-01-14 Thread Jeff King
On Wed, Jan 14, 2015 at 03:40:53PM -0800, Junio C Hamano wrote: > pack-bitmap.c | 28 ++-- > pack-bitmap.h | 1 - > 2 files changed, 14 insertions(+), 15 deletions(-) Looks good. I have some other not-yet-public bitmap stuff to send pending cleanup and testing, but I che

Re: [PATCH 05/10] urlmatch.c: make match_urls() static

2015-01-14 Thread Jeff King
On Wed, Jan 14, 2015 at 03:40:50PM -0800, Junio C Hamano wrote: > No external callers exist. I think there was some notion that we might use this elsewhere (e.g., to harmonize the credential.* and http.* config matching rules). But I do not have any plans to work on that soon, and I am not even

Re: [PATCH 03/10] prompt.c: remove git_getpass() nobody uses

2015-01-14 Thread Jeff King
On Wed, Jan 14, 2015 at 03:40:48PM -0800, Junio C Hamano wrote: > -char *git_getpass(const char *prompt) > -{ > - return git_prompt(prompt, PROMPT_ASKPASS); > -} Yay. This was whittled down to a compatibility wrapper around the more flexible git_prompt, waiting for the final callers to go awa

Re: [PATCH 01/10] http.c: make finish_active_slot() and handle_curl_result() static

2015-01-14 Thread Jeff King
On Wed, Jan 14, 2015 at 03:40:46PM -0800, Junio C Hamano wrote: > No external callers exist. I think this is sensible. They used to be used directly by remote-curl.c for the smart-http protocol. But they got wrapped by run_one_slot in beed336 (http: never use curl_easy_perform, 2014-02-18). And I

Re: Big repo not shrinking on repack or gc?

2015-01-14 Thread Andreas Krey
On Thu, 15 Jan 2015 12:23:00 +, Bryan Turner wrote: ... > > Guess in the dark: "ls -l .git/objects/pack" > > Do you see any .keep files? Lots of. :-( > I'm one of the Stash developers and just noticed this thread. If the > repository in question has been forked via Stash there likely _will_ >

Re: Unused #include statements

2015-01-14 Thread Jeff King
On Thu, Jan 15, 2015 at 05:14:39AM +0100, Robert Schiele wrote: > Thus doing those kind of brute-force removals generally makes the > include structure in a project very fragile. The analysis itself you > did is still useful to identify header files that can potentially be > removed but removing t

Re: t5539 broken under Mac OS X

2015-01-14 Thread Kyle J. McKay
On Jan 14, 2015, at 13:17, Jeff King wrote: On Wed, Jan 14, 2015 at 08:50:47PM +0100, Torsten Bögershausen wrote: But, why does e.g. t0004 behave more gracefully (and skips) and t5539 just dies ? ./t0004-unwritable.sh ok 1 - setup ok 2 # skip write-tree should notice unwritable repository (

Re: Unused #include statements

2015-01-14 Thread Robert Schiele
Hi Zoltan, I can't make a statement for the git project but I consider this kind of brute-force removal a very problematic approach for languages like C and C++. The reason for that is simple: Often header files include other header files since their content depends on those other header files. Le

Unused #include statements

2015-01-14 Thread Zoltan Klinger
Hello there, Since reading a post [1] about removing some unnecessary #include statements from a git C source file I've been intrigued to see how many more might be lurking in the code base. After a bit of digging around, my brute force approach of 'remove as many #includes as possible while maki

Bulk dump of git metadata / getting git metadata into a database

2015-01-14 Thread Daniel J Clark UNMONITORED EMAIL ADDRESS
I'm wondering if anyone happens to know of software to dump all a git repo's metadata, both stored and derived, to a format - sql, xml, csv, whatever - that is easily importable into a database / manipulated programmatically. Background, for the interested: There is git repo HAPPY and and a sep

Re: Big repo not shrinking on repack or gc?

2015-01-14 Thread Bryan Turner
On Thu, Jan 15, 2015 at 4:24 AM, Junio C Hamano wrote: > Andreas Krey writes: > >> On Wed, 14 Jan 2015 07:49:36 +, Jeff King wrote: >> ... >>> You don't need the "-f" here. Just "git repack -ad" should be enough >>> (and the "-f" probably makes it _way_ slower). >> >> Indeed, factor four. >>

Re: [PATCH 00/10] mark private symbols static

2015-01-14 Thread Stefan Beller
Regarding patch 1 - 9: Reviewed-by: Stefan Beller for what it's worth. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

What's cooking in git.git (Jan 2015, #03; Wed, 14)

2015-01-14 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'. Many small low-impact topics have been merged to 'master' in preparation for 2.3-rc1 later in the week. I see nothing pressing that remain in '

[PATCH 05/10] urlmatch.c: make match_urls() static

2015-01-14 Thread Junio C Hamano
No external callers exist. Signed-off-by: Junio C Hamano --- urlmatch.c | 6 +++--- urlmatch.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/urlmatch.c b/urlmatch.c index 618d216..132d342 100644 --- a/urlmatch.c +++ b/urlmatch.c @@ -412,9 +412,9 @@ static size_t url_match

[PATCH 02/10] line-log.c: make line_log_data_init() static

2015-01-14 Thread Junio C Hamano
No external callers exist. Signed-off-by: Junio C Hamano --- line-log.c | 2 +- line-log.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/line-log.c b/line-log.c index b7864ad..a490efe 100644 --- a/line-log.c +++ b/line-log.c @@ -237,7 +237,7 @@ static void diff_ranges_rel

[PATCH 00/10] mark private symbols static

2015-01-14 Thread Junio C Hamano
Here are a handful of patches to make symbols that are only used within a .c file as static. This is not the kind of changes we would want to do in the pre-release freeze period, and it is just for reference. I may later come back to them after 2.3 final is tagged. Note that I did not blindly ma

[PATCH 03/10] prompt.c: remove git_getpass() nobody uses

2015-01-14 Thread Junio C Hamano
Signed-off-by: Junio C Hamano --- prompt.c | 5 - prompt.h | 1 - 2 files changed, 6 deletions(-) diff --git a/prompt.c b/prompt.c index 8181eeb..7540639 100644 --- a/prompt.c +++ b/prompt.c @@ -73,8 +73,3 @@ char *git_prompt(const char *prompt, int flags) } return r; } - -c

[PATCH 06/10] remote.c: make clear_cas_option() static

2015-01-14 Thread Junio C Hamano
No external callers exist. Signed-off-by: Junio C Hamano --- remote.c | 2 +- remote.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/remote.c b/remote.c index 5b9c693..0b3939c 100644 --- a/remote.c +++ b/remote.c @@ -2156,7 +2156,7 @@ struct ref *get_stale_heads(struct ref

[PATCH 09/10] read-cache.c: make fill/match_stat_data() static

2015-01-14 Thread Junio C Hamano
Signed-off-by: Junio C Hamano --- cache.h | 14 -- read-cache.c | 14 -- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/cache.h b/cache.h index f704af5..98911c8 100644 --- a/cache.h +++ b/cache.h @@ -539,20 +539,6 @@ extern int ie_modified(const stru

[PATCH 04/10] revision.c: make save_parents() and free_saved_parents() static

2015-01-14 Thread Junio C Hamano
No external callers exist. Signed-off-by: Junio C Hamano --- revision.c | 106 - revision.h | 12 +++ 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/revision.c b/revision.c index 86406a2..0f4619c 100644 --- a/revi

[PATCH 08/10] pack-bitmap.c: make pack_bitmap_filename() static

2015-01-14 Thread Junio C Hamano
Signed-off-by: Junio C Hamano --- pack-bitmap.c | 28 ++-- pack-bitmap.h | 1 - 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/pack-bitmap.c b/pack-bitmap.c index 6a81841..0cd85f6 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -252,6 +252,20 @@ static

[PATCH 07/10] shallow.c: make check_shallow_file_for_update() static

2015-01-14 Thread Junio C Hamano
No external callers exist. Signed-off-by: Junio C Hamano --- commit.h | 1 - shallow.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/commit.h b/commit.h index 5cc1e7e..9f189cb 100644 --- a/commit.h +++ b/commit.h @@ -254,7 +254,6 @@ extern int for_each_commit_graft(each_

[PATCH 01/10] http.c: make finish_active_slot() and handle_curl_result() static

2015-01-14 Thread Junio C Hamano
No external callers exist. Signed-off-by: Junio C Hamano --- http.c | 64 http.h | 2 -- 2 files changed, 32 insertions(+), 34 deletions(-) diff --git a/http.c b/http.c index 040f362..16a6a2d 100644 --- a/http.c +++ b/http.c @@ -

[PATCH 10/10] commit: show "Author:" hint when the ident is not given explicitly

2015-01-14 Thread Junio C Hamano
This is a knee-jerk response to two facts: - the author_ident_sufficiently_given() function is public but nobody uses it; - a corresponding function committer_ident_sufficiently_given() is used to determine when to add "Committer: " reminder in the log message editor. The existing log

Re: [PATCH] git-svn: show progress in working_head_info()

2015-01-14 Thread Ramkumar Ramachandra
Eric, I'm sorry, but this change isn't important enough for me to follow up. Please merge the other two patches, if you think they're good. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http:

Re: remote helper example with push/fetch capabilities

2015-01-14 Thread Andrew Mackenzie
I'm interested in doing something very similar (not to S3, but to a customer CMS repository), but have found it very difficult to find any documentation or good example code on git-remote-helpers. If you can share any learnings or references I would really appreciate it! thanks, Andrew -- To u

Re: [PATCH v2] t1050-large: generate large files without dd

2015-01-14 Thread Junio C Hamano
Jeff King writes: >> @@ -162,7 +162,7 @@ test_expect_success 'pack-objects with large loose >> object' ' > > Funny wrapping here. I imagine Junio can manage to apply it anyway, but > you may want to check your MUA settings. Thanks for a warning; luckily this was the only breakage and the result

Re: sporadic git failures on interactive rebase

2015-01-14 Thread Junio C Hamano
Eric Sunshine writes: > On Wed, Jan 14, 2015 at 4:02 PM, Jeff King wrote: >> On Wed, Jan 14, 2015 at 04:00:37PM -0500, Eric Sunshine wrote: >> >>> > So yeah, the most plausible theory to me so far is unluckiness combined >>> > with pre-1.8.4.2. That should be easy to disprove if Henning tells us

Re: [PATCH] blame.c: fix garbled error message

2015-01-14 Thread Junio C Hamano
Jeff King writes: > On Wed, Jan 14, 2015 at 09:22:52AM -0800, Junio C Hamano wrote: > ... >> And the result should merge just fine to 'maint'. > > Are we in agreement then that the resulting code with the helper is > actually easier to read? I think replacing the straight ?: lines is, but > I am

Re: [PATCH v2] t1050-large: generate large files without dd

2015-01-14 Thread Johannes Sixt
Am 14.01.2015 um 22:00 schrieb Jeff King: >> @@ -162,7 +162,7 @@ test_expect_success 'pack-objects with large loose >> object' ' > > Funny wrapping here. I imagine Junio can manage to apply it anyway, but > you may want to check your MUA settings. Argh! Forgot to switch off line wrapping. Here is

Re: t5539 broken under Mac OS X

2015-01-14 Thread Jeff King
On Wed, Jan 14, 2015 at 08:50:47PM +0100, Torsten Bögershausen wrote: > But, why does e.g. t0004 behave more gracefully (and skips) and t5539 just > dies ? > > ./t0004-unwritable.sh > ok 1 - setup > ok 2 # skip write-tree should notice unwritable repository (missing SANITY of > POSIXPERM,SANIT

Re: sporadic git failures on interactive rebase

2015-01-14 Thread Eric Sunshine
On Wed, Jan 14, 2015 at 4:02 PM, Jeff King wrote: > On Wed, Jan 14, 2015 at 04:00:37PM -0500, Eric Sunshine wrote: > >> > So yeah, the most plausible theory to me so far is unluckiness combined >> > with pre-1.8.4.2. That should be easy to disprove if Henning tells us >> > his git version. >> >> H

Re: git ignores /~/.config/git/

2015-01-14 Thread Jeff King
On Wed, Jan 14, 2015 at 07:33:07PM +, Moez Bouhlel wrote: > git exludes /~/.config/git/ from the matching list. > > ~ is the name of a dir on the root of git working tree and not my user home > dir. I'm not quite sure what you mean by "matching list". Do you mean that the path is not listed

Re: sporadic git failures on interactive rebase

2015-01-14 Thread Jeff King
On Wed, Jan 14, 2015 at 04:00:37PM -0500, Eric Sunshine wrote: > > So yeah, the most plausible theory to me so far is unluckiness combined > > with pre-1.8.4.2. That should be easy to disprove if Henning tells us > > his git version. > > Henning mentioned it at the very top of his original proble

Re: sporadic git failures on interactive rebase

2015-01-14 Thread Eric Sunshine
On Wed, Jan 14, 2015 at 4:00 PM, Eric Sunshine wrote: > On Wed, Jan 14, 2015 at 3:54 PM, Jeff King wrote: >> On Wed, Jan 14, 2015 at 09:12:46AM -0800, Junio C Hamano wrote: >> >>> Jeff King writes: >>> >>> > What happens if we rebase with it? >>> > >>> > $ git checkout 01319837 >>> > $ git r

Re: [PATCH] Documentation/init-db.txt: minor style and synopsys fixes

2015-01-14 Thread Alex Henrie
2015-01-14 13:47 GMT-07:00 Eric Sunshine : > On Wed, Jan 14, 2015 at 12:33 PM, Alexander Kuleshov > wrote: >> -'git init-db' [-q | --quiet] [--bare] [--template=] >> [--separate-git-dir ] [--shared[=]] >> - >> +'git init-db' [-q | --quiet] [--bare] [--template=] >> + [--se

Re: sporadic git failures on interactive rebase

2015-01-14 Thread Eric Sunshine
On Wed, Jan 14, 2015 at 3:54 PM, Jeff King wrote: > On Wed, Jan 14, 2015 at 09:12:46AM -0800, Junio C Hamano wrote: > >> Jeff King writes: >> >> > What happens if we rebase with it? >> > >> > $ git checkout 01319837 >> > $ git rebase -i HEAD^ >> > >> > will yield a todo file with the 8-charac

Re: [PATCH v2] t1050-large: generate large files without dd

2015-01-14 Thread Jeff King
On Wed, Jan 14, 2015 at 09:28:56PM +0100, Johannes Sixt wrote: > For some unknown reason, the dd on my Windows box segfaults randomly, > but since recently, it does so much more often than it used to, which > makes running the test suite burdensome. > > Use printf to write large files instead of

Re: sporadic git failures on interactive rebase

2015-01-14 Thread Jeff King
On Wed, Jan 14, 2015 at 09:12:46AM -0800, Junio C Hamano wrote: > Jeff King writes: > > > What happens if we rebase with it? > > > > $ git checkout 01319837 > > $ git rebase -i HEAD^ > > > > will yield a todo file with the 8-character unambiguous abbreviation. > > > > So I guess all is worki

Re: [PATCH] blame.c: fix garbled error message

2015-01-14 Thread Jeff King
On Wed, Jan 14, 2015 at 09:22:52AM -0800, Junio C Hamano wrote: > Lukas Fleischer writes: > > >> [1/5]: git-compat-util: add xstrdup_or_null helper > >> [2/5]: builtin/apply.c: use xstrdup_or_null instead of null_strdup > >> [3/5]: builtin/commit.c: use xstrdup_or_null instead of envdup >

Re: [PATCH] Documentation/init-db.txt: minor style and synopsys fixes

2015-01-14 Thread Eric Sunshine
On Wed, Jan 14, 2015 at 12:33 PM, Alexander Kuleshov wrote: > This patch constists of two minor changes: > > * line-wrap 'git init-db' synopsis > > * last possible argument '[directory]' was missed > > Signed-off-by: Alexander Kuleshov > --- > diff --git a/Documentation/git-init-db.txt b/Document

Re: git-svn metadata commands performance issue

2015-01-14 Thread Eric Wong
Niluge kiwi wrote: > Hi all, > > In magit (http://magit.github.io/), a popular git frontend within > emacs, there is a git-svn frontend. With a recent refactoring, it was > discovered that git-svn metadata commands (like "git-svn info") are > much slower than git ones: > git svn info: 130-150ms

[PATCH v2] t1050-large: generate large files without dd

2015-01-14 Thread Johannes Sixt
For some unknown reason, the dd on my Windows box segfaults randomly, but since recently, it does so much more often than it used to, which makes running the test suite burdensome. Use printf to write large files instead of dd. To emphasize that three of the large blobs are exact copies, use cp to

Re: [PATCH] init-db: remove unused #includes

2015-01-14 Thread Junio C Hamano
Junio C Hamano writes: > Alexander Kuleshov writes: > >> * "cache.h" - is unnecessary because it already included at "builtin.h" >> >> * "exec_cmd.h" - was added at a47d1813 (Allow a relative builtin template >> directory., 15 Nov 2007). init-db used 'git_exec_path' routine from >> "exec_cmd.h",

Re: [PATCH] bash completion: allow git stash store options completion

2015-01-14 Thread Junio C Hamano
"brian m. carlson" writes: [administrivia: please refrain from using Mail-follow-up-to] > For what it's worth, I'll often sketch out a script at the command > line before putting it in a file (either because I realize I'll need > to do the same thing again or I want to share it with others), so

Re: t5539 broken under Mac OS X

2015-01-14 Thread Torsten Bögershausen
On 2015-01-14 19.37, Junio C Hamano wrote: > Torsten Bögershausen writes: > >> t5539 doesn't seem to work as expected under Mac OX X 10.6 >> (10.9 is OK) >> >> I am not root. >> Are there any ideas how we can improve the situation, or how to debug ? > > As to "how to debug", the first step is to

Re: Segmentation fault in git apply

2015-01-14 Thread Michael Blume
On Wed, Jan 14, 2015 at 10:58 AM, Michael Blume wrote: > On Wed, Jan 14, 2015 at 10:48 AM, Michael Blume wrote: >> On Wed, Jan 14, 2015 at 10:44 AM, Michael Blume wrote: >>> On Wed, Jan 14, 2015 at 10:40 AM, Michael Blume >>> wrote: On Wed, Jan 14, 2015 at 10:20 AM, Michael Blume w

Re: [PATCH] init-db: remove unused #includes

2015-01-14 Thread Junio C Hamano
Alexander Kuleshov writes: > * "cache.h" - is unnecessary because it already included at "builtin.h" > > * "exec_cmd.h" - was added at a47d1813 (Allow a relative builtin template > directory., 15 Nov 2007). init-db used 'git_exec_path' routine from > "exec_cmd.h", but later it was removed at 2de9

Re: [PATCH] init-db: use OPT__QUIET macro instead OPT_BIT

2015-01-14 Thread Junio C Hamano
Alexander Kuleshov writes: > There is OPT__QUIET macro for easily -q/--quiet option defenition, > let's use it instead OPT_BIT > > Signed-off-by: Alexander Kuleshov > --- > builtin/init-db.c | 11 +-- > 1 file changed, 5 insertions(+), 6 deletions(-) This is questionable for three reas

Re: [PATCH] bash completion: allow git stash store options completion

2015-01-14 Thread brian m. carlson
On Tue, Jan 13, 2015 at 10:40:40AM -0800, Junio C Hamano wrote: Alexander Kuleshov writes: This patch adds bash completion for git stash 'store' subcommand which apperead at bd514cad (stash: introduce 'git stash store', 18 Jun 2013) Signed-off-by: Alexander Kuleshov --- Hmph. The "create"

Re: Segmentation fault in git apply

2015-01-14 Thread Michael Blume
On Wed, Jan 14, 2015 at 10:48 AM, Michael Blume wrote: > On Wed, Jan 14, 2015 at 10:44 AM, Michael Blume wrote: >> On Wed, Jan 14, 2015 at 10:40 AM, Michael Blume wrote: >>> On Wed, Jan 14, 2015 at 10:20 AM, Michael Blume >>> wrote: This is a mac with a fresh build of git from pu branch,

Re: [PATCH] diff: added '-q' option, short option for '--quiet'

2015-01-14 Thread Junio C Hamano
Alexander Kuleshov writes: > Signed-off-by: Alexander Kuleshov > --- > Documentation/diff-options.txt | 1 + > diff.c | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) I think we have deliberately refrained from doing this, as it will make "git diff" inconsisten

Re: Segmentation fault in git apply

2015-01-14 Thread Junio C Hamano
Michael Blume writes: > This is a mac with a fresh build of git from pu branch, commit 53b80d0. Hmm, I do not see anything suspicious between master and pu. Is it possible to bisect? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.ke

Re: Segmentation fault in git apply

2015-01-14 Thread Michael Blume
On Wed, Jan 14, 2015 at 10:44 AM, Michael Blume wrote: > On Wed, Jan 14, 2015 at 10:40 AM, Michael Blume wrote: >> On Wed, Jan 14, 2015 at 10:20 AM, Michael Blume wrote: >>> This is a mac with a fresh build of git from pu branch, commit 53b80d0. >>> >>> With my gitconfig looking like >>> >>> [us

Re: Segmentation fault in git apply

2015-01-14 Thread Michael Blume
On Wed, Jan 14, 2015 at 10:40 AM, Michael Blume wrote: > On Wed, Jan 14, 2015 at 10:20 AM, Michael Blume wrote: >> This is a mac with a fresh build of git from pu branch, commit 53b80d0. >> >> With my gitconfig looking like >> >> [user] >> email = blume.m...@gmail.com >> name = Michael Bl

Re: Segmentation fault in git apply

2015-01-14 Thread Michael Blume
On Wed, Jan 14, 2015 at 10:20 AM, Michael Blume wrote: > This is a mac with a fresh build of git from pu branch, commit 53b80d0. > > With my gitconfig looking like > > [user] > email = blume.m...@gmail.com > name = Michael Blume > [apply] > whitespace = fix > [core] > whitespace =

Re: t5539 broken under Mac OS X

2015-01-14 Thread Junio C Hamano
Torsten Bögershausen writes: > t5539 doesn't seem to work as expected under Mac OX X 10.6 > (10.9 is OK) > > I am not root. > Are there any ideas how we can improve the situation, or how to debug ? As to "how to debug", the first step is to grep for that message and notice that it comes from her

git ignores /~/.config/git/

2015-01-14 Thread Moez Bouhlel
git exludes /~/.config/git/ from the matching list. ~ is the name of a dir on the root of git working tree and not my user home dir. pgphhw3k02WET.pgp Description: PGP signature

Segmentation fault in git apply

2015-01-14 Thread Michael Blume
This is a mac with a fresh build of git from pu branch, commit 53b80d0. With my gitconfig looking like [user] email = blume.m...@gmail.com name = Michael Blume [apply] whitespace = fix [core] whitespace = fix,trailing-space,space-before-tab, tab-in-indent, tabwidth=4 If I run git

Re: [PATCH] receive-pack.c: don't miss exporting unsolicited push certificates

2015-01-14 Thread Junio C Hamano
Stefan Beller writes: > On Mon, Jan 12, 2015 at 11:07 AM, Junio C Hamano wrote: >>> >>> yes that's what I was trying to hint at. The hook would just see >>> it is unsolicited instead of not having the state available. >> >> OK. That makes sort of sense. So if we: >> >> 1) did not apply either

[PATCH] init-db: remove unused #includes

2015-01-14 Thread Alexander Kuleshov
* "cache.h" - is unnecessary because it already included at "builtin.h" * "exec_cmd.h" - was added at a47d1813 (Allow a relative builtin template directory., 15 Nov 2007). init-db used 'git_exec_path' routine from "exec_cmd.h", but later it was removed at 2de9de5e (Move code interpreting path rela

Re: [PATCH] stash: git stash create and git stash store added to git stash usage synopsys

2015-01-14 Thread Junio C Hamano
Scott Schmit writes: [administrivia: please refrain from using Mail-follow-up-to] > On Tue, Jan 13, 2015 at 11:54:06PM +0600, Alexander Kuleshov wrote: >> Signed-off-by: Alexander Kuleshov >> --- >> git-stash.sh | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/gi

Re: How to prevent empty git commit --amend

2015-01-14 Thread Junio C Hamano
Junio C Hamano writes: > Matthieu Moy writes: > >> Ivo Anjo writes: >> >>> Is there a way to prevent a *git commit --amend** with nothing to >>> commit from working? >>> If not, I would like to suggest that this feature would be very helpful :) >> >> I don't know any way to let Git do the check

[PATCH] diff: added '-q' option, short option for '--quiet'

2015-01-14 Thread Alexander Kuleshov
Signed-off-by: Alexander Kuleshov --- Documentation/diff-options.txt | 1 + diff.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 2b15050..9160c90 100644 --- a/Documentation/diff-o

[PATCH] Documentation/init-db.txt: minor style and synopsys fixes

2015-01-14 Thread Alexander Kuleshov
This patch constists of two minor changes: * line-wrap 'git init-db' synopsis * last possible argument '[directory]' was missed Signed-off-by: Alexander Kuleshov --- Documentation/git-init-db.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/git-init-db

[PATCH] init-db: use OPT__QUIET macro instead OPT_BIT

2015-01-14 Thread Alexander Kuleshov
There is OPT__QUIET macro for easily -q/--quiet option defenition, let's use it instead OPT_BIT Signed-off-by: Alexander Kuleshov --- builtin/init-db.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/builtin/init-db.c b/builtin/init-db.c index 280454a..a89343b 100

Re: [PATCH] t1050-large: replace dd by test-genrandom

2015-01-14 Thread Junio C Hamano
Jeff King writes: > On Tue, Jan 13, 2015 at 03:40:10PM -0800, Junio C Hamano wrote: > >> >> - test-genrandom seed2 250 >huge && >> >> + printf "\0%250s" Y >huge && >> [...] >> Are we depending on the binary-ness of these test files by the way? >> The leading NUL \0 looked a bit strange to

Re: [PATCH v2] standardize usage info string format

2015-01-14 Thread Junio C Hamano
Matthieu Moy writes: > Alex Henrie writes: > >> This patch puts the usage info strings that were not already in docopt- >> like format into docopt-like format, which will be a litle easier for >> end users and a lot easier for translators. Changes include: >> >> - Placing angle brackets around f

Re: How to prevent empty git commit --amend

2015-01-14 Thread Junio C Hamano
Matthieu Moy writes: > Ivo Anjo writes: > >> Is there a way to prevent a *git commit --amend** with nothing to >> commit from working? >> If not, I would like to suggest that this feature would be very helpful :) > > I don't know any way to let Git do the check for you, but > > git diff --stage

Re: Big repo not shrinking on repack or gc?

2015-01-14 Thread Junio C Hamano
Andreas Krey writes: > On Wed, 14 Jan 2015 07:49:36 +, Jeff King wrote: > ... >> You don't need the "-f" here. Just "git repack -ad" should be enough >> (and the "-f" probably makes it _way_ slower). > > Indeed, factor four. > > However, my expectation is that a repack -ad will remove all the

Re: [PATCH] blame.c: fix garbled error message

2015-01-14 Thread Junio C Hamano
Lukas Fleischer writes: >> [1/5]: git-compat-util: add xstrdup_or_null helper >> [2/5]: builtin/apply.c: use xstrdup_or_null instead of null_strdup >> [3/5]: builtin/commit.c: use xstrdup_or_null instead of envdup >> [4/5]: use xstrdup_or_null to replace ternary conditionals >> [5/5]: b

Re: sporadic git failures on interactive rebase

2015-01-14 Thread Junio C Hamano
Jeff King writes: > What happens if we rebase with it? > > $ git checkout 01319837 > $ git rebase -i HEAD^ > > will yield a todo file with the 8-character unambiguous abbreviation. > > So I guess all is working as intended there. Perhaps you really were > just very unlucky and an earlier step

Re: Big repo not shrinking on repack or gc?

2015-01-14 Thread Andreas Krey
On Wed, 14 Jan 2015 15:39:46 +, Andreas Krey wrote: ... > This is not the case. :-( (Done only with 1.8.2 due to > lack of compilers for this box.) Neither for current git (copied repo to other machine) There is one new pack file of a plausible size (25G), and 65G worth of old packfiles. Andr

t5539 broken under Mac OS X

2015-01-14 Thread Torsten Bögershausen
t5539 doesn't seem to work as expected under Mac OX X 10.6 (10.9 is OK) I am not root. Are there any ideas how we can improve the situation, or how to debug ? t> t> ./t5539-fetch-http-shallow.sh ; echo $? 1..0 # SKIP Cannot run httpd tests as root 0 t> t> GIT_TEST_HTTPD=t ./t5539-fetch-http-sha

Re: Big repo not shrinking on repack or gc?

2015-01-14 Thread Andreas Krey
On Wed, 14 Jan 2015 07:49:36 +, Jeff King wrote: ... > You don't need the "-f" here. Just "git repack -ad" should be enough > (and the "-f" probably makes it _way_ slower). Indeed, factor four. However, my expectation is that a repack -ad will remove all the old pack files, as what is in ther

Re: [PATCH] blame.c: fix garbled error message

2015-01-14 Thread Lukas Fleischer
On Tue, 13 Jan 2015 at 02:54:27, Jeff King wrote: > On Mon, Jan 12, 2015 at 04:11:06PM -0800, Junio C Hamano wrote: > > > Jeff King writes: > > > > > As an aside, I have often been tempted to have xstrdup silently > > > propagate a NULL. It would have been the right thing to do here, but > > > m

Re: [ANNOUNCE] Git v2.3.0-rc0

2015-01-14 Thread Christian Neukirchen
Junio C Hamano writes: > * "git push" into a repository with a working tree normally refuses >to modify the branch that is checked out. The command learned to >optionally do an equivalent of "git reset --hard" only when there >is no change to the working tree and the index instead,

Re: Big repo not shrinking on repack or gc?

2015-01-14 Thread Andreas Krey
On Wed, 14 Jan 2015 07:49:36 +, Jeff King wrote: > On Wed, Jan 14, 2015 at 12:51:30PM +0100, Andreas Krey wrote: > > > I have a repo here that is 130G, but when I clone --mirror it, the result > > is only 25G big. Because of the --mirror I don't think that I missed > > any refs that keep obje

Re: Big repo not shrinking on repack or gc?

2015-01-14 Thread Jeff King
On Wed, Jan 14, 2015 at 12:51:30PM +0100, Andreas Krey wrote: > I have a repo here that is 130G, but when I clone --mirror it, the result > is only 25G big. Because of the --mirror I don't think that I missed > any refs that keep objects only in the source repo. Perhaps some objects are mentione

Re: How to prevent empty git commit --amend

2015-01-14 Thread Matthieu Moy
Ivo Anjo writes: > Hello, > > On Wed, Jan 14, 2015 at 10:00 AM, Matthieu Moy > wrote: >> [alias] >> amend = !git diff --staged --quiet || git commit --amend >> >> and then use "git amend". > > Genius! This is exactly what I wanted, thanks! You probably want to tweak the alias by adding

Re: [PATCH v2] standardize usage info string format

2015-01-14 Thread Matthieu Moy
Alex Henrie writes: > This patch puts the usage info strings that were not already in docopt- > like format into docopt-like format, which will be a litle easier for > end users and a lot easier for translators. Changes include: > > - Placing angle brackets around fill-in-the-blank parameters > -

Re: sporadic git failures on interactive rebase

2015-01-14 Thread Jeff King
On Wed, Jan 14, 2015 at 07:19:15AM -0500, Jeff King wrote: > Hmm. There are some instances in git where we know we are looking for an > object of a particular type, and we can disambiguate a short-sha1 based > on the type. And "git log" is just such a place, whereas a generic "git > rev-parse" use

Re: sporadic git failures on interactive rebase

2015-01-14 Thread Jeff King
On Tue, Jan 13, 2015 at 11:54:32AM +0100, Henning Moll wrote: > . error: short SHA1 c4095c1 is ambiguous. > . fatal: Needed a single revision > . Invalid commit name: c4095c1 > > Now that the command failed, i checked for ambigous c4095c1. But there is > only one: > $ git log -1 c4095c1 > . comm

Re: How to prevent empty git commit --amend

2015-01-14 Thread Ivo Anjo
Hello, On Wed, Jan 14, 2015 at 10:00 AM, Matthieu Moy wrote: > I don't know any way to let Git do the check for you, but > > git diff --staged --quiet || git commit --amend > > should do it. You can alias it like > > [alias] > amend = !git diff --staged --quiet || git commit --amend > > a

Big repo not shrinking on repack or gc?

2015-01-14 Thread Andreas Krey
Hi everybody, I have a repo here that is 130G, but when I clone --mirror it, the result is only 25G big. Because of the --mirror I don't think that I missed any refs that keep objects only in the source repo. I already tried 'git repack -fad' and 'git gc' to shrink the original repo, but it only

Re: [PATCH] git-prompt: preserve value of $? in all cases

2015-01-14 Thread SZEDER Gábor
Hi, Quoting Tony Finch : Signed-off-by: Tony Finch --- contrib/completion/git-prompt.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 3c3fc6d..3e70e74 100644 --- a/contrib/completion/git-

Re: commit --amend --author error

2015-01-14 Thread Jeff King
On Tue, Jan 13, 2015 at 12:24:18PM +0100, Michael J Gruber wrote: > Gunnar Wagner schrieb am 13.01.2015 um 09:15: > > I got APGL licensed code from someone else and want to post it on my > > github (without taking credit for the work) > > > > tried git commit --amend --author="Author name, www

Re: [PATCH v5 1/2] git-prompt.sh: if pc mode, immediately set PS1

2015-01-14 Thread SZEDER Gábor
Hi, Quoting Richard Hansen : At the beginning of __git_ps1, right after determining that the function is running in pc mode, set PS1 to a plain (undecorated) prompt. This makes it possible to simply return early without having to set PS1 if the prompt should not be decorated. Signed-off-by: R

Re: [PATCH] t1050-large: replace dd by test-genrandom

2015-01-14 Thread Jeff King
On Tue, Jan 13, 2015 at 03:40:10PM -0800, Junio C Hamano wrote: > >> - test-genrandom seed2 250 >huge && > >> + printf "\0%250s" Y >huge && > [...] > Are we depending on the binary-ness of these test files by the way? > The leading NUL \0 looked a bit strange to me. I don't think so. We

Re: How to prevent empty git commit --amend

2015-01-14 Thread Matthieu Moy
Ivo Anjo writes: > Is there a way to prevent a *git commit --amend** with nothing to > commit from working? > If not, I would like to suggest that this feature would be very helpful :) I don't know any way to let Git do the check for you, but git diff --staged --quiet || git commit --amend sh

[PATCH] git-prompt: preserve value of $? in all cases

2015-01-14 Thread Tony Finch
Signed-off-by: Tony Finch --- contrib/completion/git-prompt.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 3c3fc6d..3e70e74 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/complet

Re: [PATCH v2] git-prompt: preserve value of $? inside shell prompt

2015-01-14 Thread Tony Finch
SZEDER Gábor wrote: > > Makes sense, but the patch doesn't cover all cases, because > __git_ps1() can exit early Thanks for looking at the patch. I feel quite silly for missing the other return points :-( Follow-up patch on the way... Tony. -- f.anthony.n.finchhttp://dotat.at/ Faeroes, Sout