Re: ephemeral-branches instead of detached-head?

2013-08-13 Thread Duy Nguyen
On Mon, Aug 12, 2013 at 3:37 PM, David Jeske dav...@gmail.com wrote: Is there currently any way to say hey, git, show me what commits are dangling that might be lost in the reflog? How do you define dangling commits? When you do git commit --amend, the current commit will become dangling (in

Re: Help with sparse checkouts

2013-08-13 Thread Duy Nguyen
On Tue, Aug 13, 2013 at 1:27 AM, Ari Entlich atrig...@ccs.neu.edu wrote: Hello all! At my current workplace, I have a git-svn repository which has an extremely large working directory. I did not use the --stdlayout option in this clone, so I have a number of branches in my working directory

Re: Remove old forgotten command: whatchanged

2013-08-13 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: +changes. You can emulate `git log` with a trivial script that pipes I'd say You can emulate `git log` and `git log -p` here, but I'm fine with your version too. -[NOTE] -Most likely, you are not directly using the core -Git Plumbing commands, but

Re: git should not use a default user.email config value

2013-08-13 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: (2) configure include.path to point at ~/.git-profile/open at the very end I'd rather have it ~/.config/git/profile/ (or $XDG_CONFIG_HOME/git/profile if $XDG_CONFIG_HOME is set), but the proposal makes sense. -- Matthieu Moy

Re: git should not use a default user.email config value

2013-08-13 Thread Matthieu Moy
Jonathan Nieder jrnie...@gmail.com writes: Hi Thorsten, Thorsten Glaser wrote[1]: git config user.email SHOULD NOT default to $(id -un)@$(hostname -f) because just too many cow-orkers seem to be unable to follow basic instructions Heh. Can you say a little more about your setup? In a

Re: git should not use a default user.email config value

2013-08-13 Thread Matthieu Moy
Felipe Contreras felipe.contre...@gmail.com writes: This is how to implement that: From f1feaa05ce3772d8006078c4aeabcbd55b52d58e Mon Sep 17 00:00:00 2001 From: Felipe Contreras 2nd felipe.contrera...@gmail.com Date: Tue, 13 Nov 2012 07:33:12 +0100 Subject: [PATCH] ident: don't allow

Re: git should not use a default user.email config value

2013-08-13 Thread Thorsten Glaser
Matthieu Moy dixit: An opt-in auto-detection would be cool for people who really work in a controlled environment, so that the sysadmin could enable it from Sounds like a plan ;-) I think with several people chiming in on this, while that proposal would affect a majority of people, it would do

Re: git stash takes excessively long when many untracked files present

2013-08-13 Thread Anders Darander
Josh Triplett josh at joshtriplett.org writes: [CCing folks involved in the recent stash-refuse-to-kill merge.] I keep portions of my home directory in git. I tried to git stash some local changes, and it ran for several minutes with no progress. ps showed that it was running git ls-files

Re: git should not use a default user.email config value

2013-08-13 Thread Andrew Ardill
On Mon, Aug 12, 2013 at 11:01:03PM +1000, Andrew Ardill wrote: On 12 August 2013 22:39, Jeff King p...@peff.net wrote: We could do something like the patch below, which allows: $ git config --global include./magic/.path .gitconfig-magic to read ~/.gitconfig-magic only when we are in a

Re: git should not use a default user.email config value

2013-08-13 Thread Jeff King
On Tue, Aug 13, 2013 at 09:05:40PM +1000, Andrew Ardill wrote: I applied this on top of latest next (1da3ebde8999d07), and it worked perfectly for my use case. For what it's worth, it also passed the test suite! Would be great to see this, or something on the same theme, get into master.

Re: git should not use a default user.email config value

2013-08-13 Thread Jeff King
On Tue, Aug 13, 2013 at 07:46:35AM -0400, Jeff King wrote: The only downside I can think of is that we might want to use the subsection in include.SUBSECTION.* for some other limiting conditions (e.g., only include this config when running version = X.Y, or even include only when environment

Re: git should not use a default user.email config value

2013-08-13 Thread Andrew Ardill
On 13 August 2013 21:46, Jeff King p...@peff.net wrote: Like I said, I do not have a particular use for it, but I don't think it would hurt anybody who does not use it. If you want to polish it up into a real patch with docs and tests, I don't mind. I'll have a go at this. The only downside

[RFC/PATCH] git-remote-mediawiki: reset private ref after non-dumb push

2013-08-13 Thread Matthieu Moy
Git-mediawiki's dumb push sends the local revisions to the remote wiki, but does not update the local metadata to reflect the push (hence, the next pull will have to re-import the exported revisions). The previous implementation was simply omitting the update to the private ref after a dumb push.

Re: ephemeral-branches instead of detached-head?

2013-08-13 Thread Duy Nguyen
On Tue, Aug 13, 2013 at 9:44 PM, David Jeske dav...@gmail.com wrote: On Aug 12, 2013 11:06 PM, Duy Nguyen pclo...@gmail.com wrote: On Mon, Aug 12, 2013 at 3:37 PM, David Jeske dav...@gmail.com wrote: Is there currently any way to say hey, git, show me what commits are dangling that might be

Fwd: ephemeral-branches instead of detached-head?

2013-08-13 Thread David Jeske
On Aug 12, 2013 11:06 PM, Duy Nguyen pclo...@gmail.com wrote: On Mon, Aug 12, 2013 at 3:37 PM, David Jeske dav...@gmail.com wrote: Is there currently any way to say hey, git, show me what commits are dangling that might be lost in the reflog? How do you define dangling commits? Any

Re: git should not use a default user.email config value

2013-08-13 Thread Jeff King
On Tue, Aug 13, 2013 at 10:52:34PM +1000, Andrew Ardill wrote: The only downside I can think of is that we might want to use the subsection in include.SUBSECTION.* for some other limiting conditions (e.g., only include this config when running version = X.Y, or even include only when

Re: [PATCH] whatchanged: document its historical nature

2013-08-13 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: Hmm, I hadn't realised that specifying -p would disable the --raw. I still find the last sentence of the original patch slightly awkward though. How about New users are encouraged to use linkgit:git-log[1] instead. The `whatchanged` command

Re: Remove old forgotten command: whatchanged

2013-08-13 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Junio C Hamano gits...@pobox.com writes: +changes. You can emulate `git log` with a trivial script that pipes I'd say You can emulate `git log` and `git log -p` here, but I'm fine with your version too. By `git log`, I meant `git log` with

Re: git should not use a default user.email config value

2013-08-13 Thread Junio C Hamano
Jeff King p...@peff.net writes: diff --git a/config.c b/config.c index e13a7b6..a31dc85 100644 --- a/config.c +++ b/config.c @@ -119,10 +119,45 @@ int git_config_include(const char *var, const char *value, void *data) return ret; } +static NORETURN void die_bad_regex(int err,

Re: git should not use a default user.email config value

2013-08-13 Thread Junio C Hamano
Jeff King p...@peff.net writes: I guess we could do something like: [include repo:...your regex here...] path = .gitconfig-only-for-some-repos [include env:USE_MY_MAGIC_CONFIG] path = .gitconfig-only-when-magic-env-set I am not sure if env is very useful, but there certainly

Re: [PATCH v3] push: respect --no-thin

2013-08-13 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: transport_get() actually sets thin option to 1 by default. Yeah, I missed your message in the nearby thread. It indeed does. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo

Re: ephemeral-branches instead of detached-head?

2013-08-13 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Mon, Aug 12, 2013 at 3:37 PM, David Jeske dav...@gmail.com wrote: Is there currently any way to say hey, git, show me what commits are dangling that might be lost in the reflog? How do you define dangling commits? When you do git commit --amend, the

Re: Fwd: ephemeral-branches instead of detached-head?

2013-08-13 Thread Junio C Hamano
David Jeske dav...@gmail.com writes: When you do git commit --amend, the current commit will become dangling (in the sense that it's not referred by any ref, but the commit exists) and those are just noise in my opinion. This is *exactly* my point. There is no way to distinguish a commit

Re: git stash takes excessively long when many untracked files present

2013-08-13 Thread Junio C Hamano
Anders Darander anders.daran...@gmail.com writes: diff --git a/git-stash.sh b/git-stash.sh index 85c9e2c..e5a2043 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -263,7 +263,7 @@ save_stash () { exit 0 fi if test -z $untracked$force - test -n

Re: Fwd: ephemeral-branches instead of detached-head?

2013-08-13 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: David Jeske dav...@gmail.com writes: When you do git commit --amend, the current commit will become dangling (in the sense that it's not referred by any ref, but the commit exists) and those are just noise in my opinion. This is *exactly* my point.

Re: git stash takes excessively long when many untracked files present

2013-08-13 Thread Anders Darander
(I'm resending this as Gmail added some html parts...) Junio C Hamano gits...@pobox.com wrote: Anders Darander anders.daran...@gmail.com writes: diff --git a/git-stash.sh b/git-stash.sh index 85c9e2c..e5a2043 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -263,7 +263,7 @@ save_stash ()

Re: [git-po] [fr] first commits for French localization (#62)

2013-08-13 Thread Junio C Hamano
Jiang Xin worldhello@gmail.com writes: Haven't seen new languages support for git l10n for over 1 year. Here comes French translation. Nice. Pulled, and will be part of -rc3. Thanks. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH master] convert: The native line-ending is \r\n on MinGW

2013-08-13 Thread Tvangeste
Brice Lambson bricelam at live.com writes: +1, this is a significant issue downstream in Git for Windows: https://github.com/msysgit/git/issues/57 Effectively this renders .gitattributes useless for the scenario of enforcing normalized line ending characters. +100 Folks, the problem is

Re: git stash takes excessively long when many untracked files present

2013-08-13 Thread Junio C Hamano
Anders Darander anders.daran...@gmail.com writes: Do anyone have any better idea on how to approach this? Teaching ls-files to leave early once it seens even a single output is probably a possibility. Would that mean that we're able to fail early? Heh, good point. Leave once you find one

Re: [PATCH master] convert: The native line-ending is \r\n on MinGW

2013-08-13 Thread Junio C Hamano
Tvangeste i.4m.l...@yandex.ru writes: Brice Lambson bricelam at live.com writes: +1, this is a significant issue downstream in Git for Windows: https://github.com/msysgit/git/issues/57 Effectively this renders .gitattributes useless for the scenario of enforcing normalized line ending

FGT

2013-08-13 Thread MHQ1
Dear winner, Microsoft organization is glad to pronounce your email ID as the lucky winner of £1,000,000'00 send us the following details to claims award.Do note that no ticket was sold nor ballot paper,it was conducted via random selection of so many emails and your email emerge as a

[PATCH] unpack-trees: plug a memory leak

2013-08-13 Thread René Scharfe
From: Felipe Contreras felipe.contre...@gmail.com Before overwriting the destination index, first let's discard its contents. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Tested-by: Лежанкин Иван abys...@gmail.com wrote: --- Felipe sent this patch as part of multiple series in

re-ignoring a force added file

2013-08-13 Thread Raza Ali
Dear Git Mailing List, I have force added a file we usually like to ignore (but keep in the repository). That was a change a while ago, and cannot be undone without serious pain. I would like to re-ignore the file though, as we dont want to track changes to it. Some of the options I came

[PATCH] Rewriting git-repack in C

2013-08-13 Thread Stefan Beller
Hello, a few days ago, I asked how I would proceed if I'd want to rewrite git-repack. The general consensus (Duy, Junio and Matthieu) was to not touch git-pack-objects, but rather translate the shell version of the git-repack to C. I'll send a very rough patch, which still contains 2 todos, so it

[PATCH] repack: rewrite the shell script in C.

2013-08-13 Thread Stefan Beller
This is the beginning of the rewrite of the repacking. Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- Makefile | 2 +- builtin.h | 1 + builtin/repack.c | 313 +

Re: [PATCH 3/3] contacts: reduce git-blame invocations

2013-08-13 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: git-contacts invokes git-blame once for each patch hunk it encounters. No attempt is made to consolidate invocations for multiple hunks referencing the same file at the same revision. This can become expensive quickly. Reduce the number of

Re: [PATCH] unpack-trees: plug a memory leak

2013-08-13 Thread Junio C Hamano
René Scharfe l@web.de writes: From: Felipe Contreras felipe.contre...@gmail.com Before overwriting the destination index, first let's discard its contents. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Tested-by: Лежанкин Иван abys...@gmail.com wrote: --- Felipe sent

Re: [PATCH] unpack-trees: plug a memory leak

2013-08-13 Thread René Scharfe
Am 13.08.2013 23:12, schrieb Junio C Hamano: René Scharfe l@web.de writes: From: Felipe Contreras felipe.contre...@gmail.com Before overwriting the destination index, first let's discard its contents. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Tested-by: Лежанкин Иван

Re: git stash takes excessively long when many untracked files present

2013-08-13 Thread Junio C Hamano
[administrivia: people on the original thread added back on CC] Junio C Hamano gits...@pobox.com writes: Anders Darander anders.daran...@gmail.com writes: Do anyone have any better idea on how to approach this? Teaching ls-files to leave early once it seens even a single output is probably a

Re: [PATCH] unpack-trees: plug a memory leak

2013-08-13 Thread Junio C Hamano
René Scharfe l@web.de writes: It was lost in the follow-up discussion and I missed it. I had forgotten about it as well, until Felipe mentioned it again. I assume that this is signed-off by you as a forwarder? I'd prefer to even mark it Reviewed-by: you. Right, I did review the patch

What's cooking in git.git (Aug 2013, #03; Tue, 13)

2013-08-13 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'. The -rc3 has been tagged; we will need to revert a7365313 (git stash: avoid data loss when git stash save kills a directory, 2013-06-28) that

[ANNOUNCE] Git v1.8.4-rc3

2013-08-13 Thread Junio C Hamano
A release candidate Git v1.8.4-rc3 is now available for testing at the usual places. Things have calmed down on the 'master' front; we will still need to revert one commit that killed git stash in a large directory with a lot of cruft before the final, but other than that, everything else should

Re: ephemeral-branches instead of detached-head?

2013-08-13 Thread Sitaram Chamarty
On 08/13/2013 10:19 PM, Junio C Hamano wrote: Duy Nguyen pclo...@gmail.com writes: On Mon, Aug 12, 2013 at 3:37 PM, David Jeske dav...@gmail.com wrote: Is there currently any way to say hey, git, show me what commits are dangling that might be lost in the reflog? How do you define dangling

Re: ephemeral-branches instead of detached-head?

2013-08-13 Thread Junio C Hamano
Sitaram Chamarty sitar...@gmail.com writes: # all reflog entries that are not on a branch, tag, or remote d1 = !gitk --date-order $(git log -g --pretty=%H) --not --branches --tags --remotes # all dangling commits not on a branch, tag, or remote d2 = !gitk --date-order $(git

Possible git bug

2013-08-13 Thread Hugh Davenport
Hey, Not sure if this is a bug or not. I commonly am finding myself wanting to remove some recent commits, either all or just a select few. So I use rebase in interactive mode for this. The problem I find is that when I do a rebase and leave no commits to pick (where I would think that this

Re: Possible git bug

2013-08-13 Thread Daniel Knittl-Frank
On Wed, Aug 14, 2013 at 6:50 AM, Hugh Davenport h...@davenport.net.nz wrote: Hey, Not sure if this is a bug or not. I commonly am finding myself wanting to remove some recent commits, either all or just a select few. So I use rebase in interactive mode for this. The problem I find is that