Re: [RFC/PATCH 1/2] reset: learn to reset to tree

2012-12-01 Thread Junio C Hamano
Martin von Zweigbergk martinv...@gmail.com writes: On Thu, Nov 29, 2012 at 2:00 PM, Martin von Zweigbergk martinv...@gmail.com wrote: Slightly off topic, but another difference (or somehow another aspect of the same difference?) that has tripped me up a few times is that git checkout $rev .

Re: [PATCH] fast-export: Allow pruned-references in mark file

2012-12-01 Thread Antoine Pelisse
Yeah, I think I agree that you would need to make sure that the other side does not use the revision marked with :2, once you retire the object you originally marked with :2 by pruning. Shouldn't the second export show :1 and :3 but not :2? It feels like a bug in the exporter to me that the

Re: [PATCH 0/5] diff --stat counting fixes

2012-12-01 Thread Antoine Pelisse
Hi Junio, That does make a lot of sense and I would have indeed missed a couple of things here. I've been thinking about that Unmerged line quite a lot, and I can't get myself any good reason to keep it. Would you mind taking a couple of minutes to make it clear ? I feel like (but I can

[PATCH v2 0/4] git-svn: More docs for branch handling in

2012-12-01 Thread Sebastian Leske
Updated version of my documentation patch for git-svn. Thanks to Michael J Gruber and Eric Wong for helpful comments. Sebastian Leske (4): git-svn: Document branches with at-sign(@). Recommend use of structure options for git svn. git-svn: Expand documentation for --follow-parent git-svn:

[PATCH v2 1/4] git-svn: Document branches with at-sign(@).

2012-12-01 Thread Sebastian Leske
git svn will sometimes create branches with an at-sign in the name (branchname@revision). These branches confuse many users and it is a FAQ why they are created. Document when git svn will create them. Signed-off-by: Sebastian Leske sebastian.le...@sleske.name --- Documentation/git-svn.txt |

[PATCH v2 2/4] Recommend use of structure options for git svn.

2012-12-01 Thread Sebastian Leske
Document that when using git svn, one should usually either use the directory structure options to import branches as branches, or only import one subdirectory. The default behaviour of cloning all branches and tags as subdirectories in the working copy is usually not what the user wants.

[PATCH v2 4/4] git-svn: Note about tags.

2012-12-01 Thread Sebastian Leske
Document that 'git svn' will import SVN tags as branches. Signed-off-by: Sebastian Leske sebastian.le...@sleske.name --- Documentation/git-svn.txt |7 +++ 1 file changed, 7 insertions(+) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 6bda014..18d5e45 100644 ---

[PATCH v2 3/4] git-svn: Expand documentation for --follow-parent

2012-12-01 Thread Sebastian Leske
Describe what the option --follow-parent does, and what happens if it is set or unset. Signed-off-by: Sebastian Leske sebastian.le...@sleske.name --- Documentation/git-svn.txt | 15 --- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Documentation/git-svn.txt

Bug report : gitattribute export-ignore behavior does not match documentation

2012-12-01 Thread Jean-Noël AVILA
Tested on latest maint and master. The 'export-ignore' gitattribute is documented as behaving on a pattern, just like in .gitignore. In repo where I have a tree like this: .gitattributes figures/ fr/figures/ I want to remove from archive all the figures directories. So I added figures/

Re: [msysGit] [PATCH/RFC 1/5] mingw: make fgetc raise SIGINT if apropriate

2012-12-01 Thread Erik Faye-Lund
On Fri, Nov 30, 2012 at 7:11 PM, Jeff King p...@peff.net wrote: On Fri, Nov 30, 2012 at 06:58:11PM +0100, Johannes Schindelin wrote: Hi, On Tue, 13 Nov 2012, Erik Faye-Lund wrote: Set a control-handler to prevent the process from terminating, and simulate SIGINT so it can be handled by a

Re: [PATCH 0/5] ignore SIG{INT,QUIT} when launching editor

2012-12-01 Thread Krzysztof Mazur
On Fri, Nov 30, 2012 at 05:39:43PM -0500, Jeff King wrote: This is a re-roll of the pf/editor-ignore-sigint series. People mentioned some buggy editors which go into an infinite EIO loop when their parent dies due to SIGQUIT. That should be a non-issue now, as we will be ignoring SIGQUIT.

Re: [msysGit] [PATCH/RFC 1/5] mingw: make fgetc raise SIGINT if apropriate

2012-12-01 Thread Erik Faye-Lund
On Fri, Nov 30, 2012 at 6:58 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: Hi, On Tue, 13 Nov 2012, Erik Faye-Lund wrote: Set a control-handler to prevent the process from terminating, and simulate SIGINT so it can be handled by a signal-handler as usual. One thing you might

Re: [msysGit] [PATCH/RFC 2/5] compat/terminal: factor out echo-disabling

2012-12-01 Thread Erik Faye-Lund
On Fri, Nov 30, 2012 at 6:59 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: Hi, On Tue, 13 Nov 2012, Erik Faye-Lund wrote: By moving the echo-disabling code to a separate function, we can implement OS-specific versions of it for non-POSIX platforms. Signed-off-by: Erik Faye-Lund

Re: [RFC] remove/deprecate 'submodule init' and 'sync'

2012-12-01 Thread W. Trevor King
On Fri, Nov 30, 2012 at 06:52:22PM -0500, Phil Hord wrote: If I never 'submodule init' a submodule, it does not get visited by 'git submodule foreach', among others. I think some people use this behavior explicitly. This is something I'll fix while working up a trial patch. Currently

Also close config file handle when leaving git_config_set_multivar_in_file() early

2012-12-01 Thread 乙酸鋰
Hi, This patch fixes the captioned problem. It is needed because our program statically link git. In this case, do not assume a fail will call die() and exit program so the handle is leave not closed. Regards, ch3cooli 0001-Also-close-config-file-handle-when-leaving-git_confi.patch

Re: [RFC] remove/deprecate 'submodule init' and 'sync'

2012-12-01 Thread Jens Lehmann
Am 30.11.2012 18:53, schrieb W. Trevor King: In my v5 patch, I check for submodule.name.remote first in the usual `git config` files. If I don't find what I'm looking for I fall back on .gitmodules (basically Jens' suggestion). However, my initial copying-to-.git/config approach was mostly

Re: [RFC] remove/deprecate 'submodule init' and 'sync'

2012-12-01 Thread Jens Lehmann
Am 01.12.2012 13:48, schrieb W. Trevor King: On Fri, Nov 30, 2012 at 06:52:22PM -0500, Phil Hord wrote: If I never 'submodule init' a submodule, it does not get visited by 'git submodule foreach', among others. I think some people use this behavior explicitly. This is something I'll fix

Re: [PATCH 0/5] ignore SIG{INT,QUIT} when launching editor

2012-12-01 Thread Paul Fox
jeff wrote: This is a re-roll of the pf/editor-ignore-sigint series. There are two changes from the original: 1. We ignore both SIGINT and SIGQUIT for least surprise compared to system(3). 2. We now use code + 128 to look for signal death (instead of WTERMSIG),

Re: [RFC] remove/deprecate 'submodule init' and 'sync'

2012-12-01 Thread Jens Lehmann
Am 01.12.2012 00:52, schrieb Phil Hord: If I never 'submodule init' a submodule, it does not get visited by 'git submodule foreach', among others. I think some people use this behavior explicitly. On the other hand, I've also notice that a submodule which I have removed does not get

Inconsistency in messages about --set-upstream from git pull and git branch

2012-12-01 Thread Dan Rosén
I added a new origin to a repository and did git pull and got this message: * [new branch] master - origin/master There is no tracking information for the current branch. Please specify which branch you want to merge with. See git-pull(1) for details git pull remote branch If you

Re: [RFC] remove/deprecate 'submodule init' and 'sync'

2012-12-01 Thread W. Trevor King
On Sat, Dec 01, 2012 at 04:38:02PM +0100, Jens Lehmann wrote: Am 30.11.2012 18:53, schrieb W. Trevor King: In my v5 patch, I check for submodule.name.remote first in the usual `git config` files. If I don't find what I'm looking for I fall back on .gitmodules (basically Jens' suggestion).

Re: [RFC] remove/deprecate 'submodule init' and 'sync'

2012-12-01 Thread W. Trevor King
On Sat, Dec 01, 2012 at 04:56:02PM +0100, Jens Lehmann wrote: Am 01.12.2012 00:52, schrieb Phil Hord: If I never 'submodule init' a submodule, it does not get visited by 'git submodule foreach', among others. I think some people use this behavior explicitly. On the other hand, I've

[PATCH] submodule: add 'deinit' command

2012-12-01 Thread Jens Lehmann
With git submodule init the user is able to tell git he cares about one or more submodules and wants to have it populated on the next call to git submodule update. But currently there is no easy way he could tell git he does not care about a submodule anymore and wants to get rid of his local work

Re: [RFC] remove/deprecate 'submodule init' and 'sync'

2012-12-01 Thread W. Trevor King
I'm currently stuck with adding a commit-less existing repository as a submodule (which happens in t7400-submodule-basic.sh, ../bar/a/b/c works with relative local path): $ mkdir -p super/sub $ cd super $ git init $ (cd sub git init) $ git submodule add ./ sub $ git status # On

Re: [RFC] remove/deprecate 'submodule init' and 'sync'

2012-12-01 Thread Jens Lehmann
Am 01.12.2012 17:30, schrieb W. Trevor King: On Sat, Dec 01, 2012 at 04:38:02PM +0100, Jens Lehmann wrote: You need to handle the 'url' setting differently. While I think the 'update' setting should not be copied into .git/config at all (because it makes it impossible for upstream to change

Re: [msysGit] [PATCH/RFC 1/5] mingw: make fgetc raise SIGINT if apropriate

2012-12-01 Thread Jeff King
On Sat, Dec 01, 2012 at 01:31:23PM +0100, Erik Faye-Lund wrote: One thing you might want to mention is that the fgetc() handling is not thread-safe, and intentionally so: if two threads read from the same console, we are in trouble anyway. That makes sense to me, but I'm confused why it

Re: [RFC] remove/deprecate 'submodule init' and 'sync'

2012-12-01 Thread W. Trevor King
On Sat, Dec 01, 2012 at 06:25:17PM +0100, Jens Lehmann wrote: Am 01.12.2012 17:30, schrieb W. Trevor King: On Sat, Dec 01, 2012 at 04:38:02PM +0100, Jens Lehmann wrote: 1) It tells the submodule commands that the user wants to have that submodule populated (which is done in a subsequent

Re: [RFC] remove/deprecate 'submodule init' and 'sync'

2012-12-01 Thread Jens Lehmann
Am 01.12.2012 18:49, schrieb W. Trevor King: I think removing `init` will cause some compatibility issues anyway, so I was re-imaging how you do it. I don't think update='none' and don't populate my submodule are distinct ideas, while a locally configured url=somwhere and please populate my

Re: [RFC] remove/deprecate 'submodule init' and 'sync'

2012-12-01 Thread W. Trevor King
On Sat, Dec 01, 2012 at 07:04:05PM +0100, Jens Lehmann wrote: Am 01.12.2012 18:49, schrieb W. Trevor King: I think removing `init` will cause some compatibility issues anyway, so I was re-imaging how you do it. I don't think update='none' and don't populate my submodule are distinct ideas,

Re: Inconsistency in messages about --set-upstream from git pull and git branch

2012-12-01 Thread Carlos Martín Nieto
Dan Rosén d...@student.chalmers.se writes: git branch --set-upstream master origin/branch This has been fixed already in 1.8.0.1 cmn -- 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

Re: [PATCH 6/8] imap-send: change msg_data from storing (char *, len) to storing strbuf

2012-12-01 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: On 11/29/2012 10:30 PM, Junio C Hamano wrote: A side effect of this change is that the memory for each message is freed after it is used rather than leaked, though that detail is unimportant given that imap-send is a top-level command. -- ?

Re: [PATCH] submodule: add 'deinit' command

2012-12-01 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de writes: With git submodule init the user is able to tell git he cares about one or more submodules and wants to have it populated on the next call to git submodule update. But currently there is no easy way he could tell git he does not care about a submodule

Re: [PATCH v7 p2 1/2] fast-export: don't handle uninteresting refs

2012-12-01 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: On Thu, Nov 29, 2012 at 2:16 AM, Max Horn post...@quendi.de wrote: On 28.11.2012, at 23:23, Felipe Contreras wrote: They have been marked as UNINTERESTING for a reason, lets respect that. Currently the first ref is handled properly, but

Re: [PATCH] gitk: add a checkbox to control the visibility of tags

2012-12-01 Thread Junio C Hamano
Łukasz Stelmach stl...@poczta.fm writes: Enable hiding of tags displayed in the tree as yellow labels. If a repository is used together with a system like Gerrit there may be quite a lot of tags used to control building and there may be hardly any place left for commit subjects.

Re: [PATCH 0/5] diff --stat counting fixes

2012-12-01 Thread Junio C Hamano
Antoine Pelisse apeli...@gmail.com writes: I feel like (but I can obviously be wrong): 1. The info is redundant. When performing a merge, all diffs (without --staged flag) are unmerged Yes, it is redundant. They are primarily meant as a warning to anybody who runs git diff --stat while their

Re: [PATCH] t4049: avoid test failures on filemode challenged file systems (Windows)

2012-12-01 Thread Junio C Hamano
Johannes Sixt j.s...@viscovery.net writes: Am 11/29/2012 21:48, schrieb Junio C Hamano: I've tested this with the testpen set on vfat mounted on my Linux box, ... and it seems to work OK, Works well here on Windows, too. Thanks for checking. -- To unsubscribe from this list: send the line

Re: [PATCH 1/2] git-fast-import.txt: improve documentation for quoted paths

2012-12-01 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Junio C Hamano gits...@pobox.com writes: That shell-style contradicts with what fast-import.c says, though. It claims to grok \octal and described as C-style. As Peff mentionned, my last version is better, although still a bit incomplete.

[PATCH v6 3/4] submodule add: If --branch is given, record it in .gitmodules

2012-12-01 Thread W. Trevor King
From: W. Trevor King wk...@tremily.us This allows you to easily record a submodule.name.branch option in .gitmodules when you add a new submodule. With this patch, $ git submodule add -b branch repository [path] $ git config -f .gitmodules submodule.path.branch branch reduces to $ git

[PATCH v6 2/4] submodule update: add --remote for submodule's upstream changes

2012-12-01 Thread W. Trevor King
From: W. Trevor King wk...@tremily.us The current `update` command incorporates the superproject's gitlinked SHA-1 ($sha1) into the submodule HEAD ($subsha1). Depending on the options you use, it may checkout $sha1, rebase the $subsha1 onto $sha1, or merge $sha1 into $subsha1. This helps you

[PATCH v6 0/4] submodule update: add --remote for submodule's upstream changes

2012-12-01 Thread W. Trevor King
From: W. Trevor King wk...@tremily.us On Thu, Nov 29, 2012 at 10:27:19PM -0500, W. Trevor King wrote: On Thu, Nov 29, 2012 at 08:11:20PM -0500, Phil Hord wrote: I've always felt that the origin defaults are broken and are simply being ignored because most users do not trip over them. But

[PATCH v6 1/4] submodule: add get_submodule_config helper funtion

2012-12-01 Thread W. Trevor King
From: W. Trevor King wk...@tremily.us Several submodule configuration variables (e.g. fetchRecurseSubmodules) are read from .gitmodules with local overrides from the usual git config files. This shell function mimics that logic to help initialize configuration variables in git-submodule.sh.

[PATCH v6 4/4] submodule update: add submodule.name.remote config option

2012-12-01 Thread W. Trevor King
From: W. Trevor King wk...@tremily.us Don't force the user to clone from the tracked repository (branch.name.remote) or `origin`. By setting submodule.name.remote in .gitmodules or the usual git config files, you can easily point a submodule at a different remote when using `submodule update

Re: does a successful 'git gc' imply 'git fsck'

2012-12-01 Thread Shawn Pearce
On Sat, Dec 1, 2012 at 6:31 PM, Sitaram Chamarty sitar...@gmail.com wrote: Background: I have a situation where I have to fix up a few hundred repos in terms of 'git gc' (the auto gc seems to have failed in many cases; they have far more than 6700 loose objects). I also found some corrupted

Re: [PATCH 6/8] imap-send: change msg_data from storing (char *, len) to storing strbuf

2012-12-01 Thread Michael Haggerty
On 12/02/2012 02:48 AM, Junio C Hamano wrote: Michael Haggerty mhag...@alum.mit.edu writes: On 11/29/2012 10:30 PM, Junio C Hamano wrote: A side effect of this change is that the memory for each message is freed after it is used rather than leaked, though that detail is unimportant given

Re: [PATCH v2 1/4] t4014: more tests about appending s-o-b lines

2012-12-01 Thread Torsten Bögershausen
On 22.11.12 17:38, Nguyễn Thái Ngọc Duy wrote: Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- t/t4014-format-patch.sh | 145 1 file changed, 145 insertions(+) + echo -n subject | append_signoff actual echo -n is not