Re: [PATCH] simplified the chain if() statements of install_branch_config() function in branch.c

2014-03-11 Thread Nemina Amarasinghe
Eric Sunshine sunshine at sunshineco.com writes: On Mon, Mar 10, 2014 at 3:58 AM, Nemina Amarasinghe neminaa at gmail.com wrote: Nemina Amarasinghe neminaa at gmail.com writes: Sorry for the first patch. Something went wrong. This is the correct one In addition to the tautological

Re: [PATCH][GSoC]simplified branch.c:install_branch_config() if() statement

2014-03-11 Thread Nemina Amarasinghe
I hope this is the correct format for patch. Please comment on this if something is wrong. Signed-off-by:Nemina Amarasinghe nemi...@gmail.com --- branch.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/branch.c b/branch.c index 0304a7a..fd93603 100644 --- a/branch.c

[PATCH nd/gitignore-trailing-whitespace] t0008: skip trailing space test on Windows

2014-03-11 Thread Johannes Sixt
From: Johannes Sixt j...@kdbg.org The Windows API does not preserve file names with trailing spaces (and dots), but rather strips them. Our tools (MSYS bash, git) base the POSIX emulation on the Windows API. As a consequence, it is impossible for bash on Windows to allocate a file whose name has

Re: [PATCH] simplified the chain if() statements of install_branch_config() function in branch.c

2014-03-11 Thread Eric Sunshine
On Tue, Mar 11, 2014 at 2:30 AM, Nemina Amarasinghe nemi...@gmail.com wrote: Eric Sunshine sunshine at sunshineco.com writes: On Mon, Mar 10, 2014 at 3:58 AM, Nemina Amarasinghe neminaa at gmail.com wrote: Nemina Amarasinghe neminaa at gmail.com writes: Sorry for the first patch.

Re: [PATCH][GSoC]simplified branch.c:install_branch_config() if() statement

2014-03-11 Thread Eric Sunshine
On Tue, Mar 11, 2014 at 3:16 AM, Nemina Amarasinghe nemi...@gmail.com wrote: Subject: simplified branch.c:install_branch_config() if() statement Use imperative tone: simplify ... I hope this is the correct format for patch. Please comment on this if something is wrong. This commentary is

[PATHv2] branch.c:install_branch_config():Simplify code generating verbose message.

2014-03-11 Thread Paweł Wawruch
Simplify the long if chain in install_branch_config(). There is a long chain of if statements. The code can be more clear. Replace the chain with table of strings. New approach is more compact. Signed-off-by: Paweł Wawruch pa...@aleg.pl --- branch.c | 40 ++--

Re: [PATCH] submodule : Add --no-separate-git-dir option to add and update command.

2014-03-11 Thread Henri GEIST
Le lundi 10 mars 2014 à 21:32 +0100, Heiko Voigt a écrit : On Mon, Mar 10, 2014 at 10:08:06AM +0100, Henri GEIST wrote: Le samedi 08 mars 2014 à 00:00 +0100, Jens Lehmann a écrit : Am 06.03.2014 23:20, schrieb Henri GEIST: What is the use case you are trying to solve and why can that

Re: [PATCH] rebase: new option to post edit a squashed or fixed up commit

2014-03-11 Thread Duy Nguyen
On Tue, Mar 11, 2014 at 2:47 AM, Junio C Hamano gits...@pobox.com wrote: Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: After squashing or fixing up, you may want to have a final look at the commit, edit some more if needed or even do some testing. --postedit enables that. This is (to me) a

Re: [PATHv2] branch.c:install_branch_config():Simplify code generating verbose message.

2014-03-11 Thread Eric Sunshine
Thanks for taking review comments from your previous attempt into account. This is a more well-crafted submission. Additional comments below. On Tue, Mar 11, 2014 at 4:40 AM, Paweł Wawruch pa...@aleg.pl wrote: Subject: [PATHv2] branch.c:install_branch_config():Simplify code generating verbose

[RFC memory leak?] Minor memory leak fix

2014-03-11 Thread Fredrik Gustafsson
Strbuf needs to be released even if it's locally declared. Signed-off-by: Fredrik Gustafsson iv...@iveqy.com --- archive.c | 21 +++-- 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/archive.c b/archive.c index 346f3b2..d6d56e6 100644 --- a/archive.c +++

[PATCH][GSoC] parse-options: Add OPT_SET_INT_NONEG.

2014-03-11 Thread Yuxuan Shui
Reference: http://git.github.io/SoC-2014-Microprojects.html Signed-off-by: Yuxuan Shui yshu...@gmail.com --- builtin/fetch.c| 5 ++--- builtin/merge.c| 5 ++--- builtin/notes.c| 10 -- builtin/pack-objects.c | 15 ++- builtin/update-index.c | 20

Re: [RFC/WIP] Pluggable reference backends

2014-03-11 Thread Karsten Blees
Am 10.03.2014 12:00, schrieb Michael Haggerty: Reference transactions -- Very cool ideas indeed. However, I'm concerned a bit that transactions are conceptual overkill. How many concurrent updates do you expect in a repository? Wouldn't a single repo-wide lock suffice

Re: [PATCH/RFC] git-gui: Add a 'recursive' checkbox in the clone menu.

2014-03-11 Thread Henri GEIST
Le mercredi 05 mars 2014 à 19:00 +0100, Jens Lehmann a écrit : Am 05.03.2014 00:01, schrieb Henri GEIST: Permit to do a 'git clone --recursive' through git-gui. I really like where this is heading! Some minor issues: - I think we should be more verbose in the commit message,

Re: [PATCH][GSOC2014] changed logical chain in branch.c to lookup tables

2014-03-11 Thread Tamer TAS
Eric Sunshine wrote On Mon, Mar 10, 2014 at 5:47 PM, Tamer TAS lt; tamertas@ gt; wrote: Section 4.3 of the GNU gettext manual [1] explains the issues in more detail. I urge you to read it. The upshot is that translators fare best when handed full sentences. Note also that your change

Re: [PATCH v2 2/2] i18n: assure command not corrupted by _() process

2014-03-11 Thread Duy Nguyen
On Mon, Mar 10, 2014 at 7:51 PM, Sandy Carter sandy.car...@savoirfairelinux.com wrote: Is there any update on this patch? The patch looks good. Maybe Junio missed it. Le 2014-03-03 09:55, Sandy Carter a écrit : Separate message from command examples to avoid translation issues such as a

Re: [RFC memory leak?] Minor memory leak fix

2014-03-11 Thread Duy Nguyen
On Tue, Mar 11, 2014 at 5:45 PM, Fredrik Gustafsson iv...@iveqy.com wrote: Strbuf needs to be released even if it's locally declared. path is declared static. So yes it's a leak but the leak is minimum. Your patch would make more sense if static is gone and it's leaked after every

[[RFC memory leak, v.2]] Minor memory leak fix

2014-03-11 Thread Fredrik Gustafsson
Strbuf needs to be released even if it's locally declared. Signed-off-by: Fredrik Gustafsson iv...@iveqy.com --- archive.c | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/archive.c b/archive.c index 346f3b2..dfc557d 100644 --- a/archive.c +++ b/archive.c @@

Re: [RFC memory leak?] Minor memory leak fix

2014-03-11 Thread Fredrik Gustafsson
On Tue, Mar 11, 2014 at 06:58:11PM +0700, Duy Nguyen wrote: On Tue, Mar 11, 2014 at 5:45 PM, Fredrik Gustafsson iv...@iveqy.com wrote: Strbuf needs to be released even if it's locally declared. path is declared static. So yes it's a leak but the leak is minimum. Your patch would make more

Re: [PATCH 03/26] t1400: Pass a legitimate newvalue to update command

2014-03-11 Thread Brad King
On 03/10/2014 05:38 PM, Michael Haggerty wrote: It seems to me that -z input will nearly always be machine-generated, so there is not much reason to accept the empty string as shorthand for zeros. So I think that my version of the rules, being simpler to explain, is a slight improvement. I

[PATCH v4] upload-pack: send shallow info over stdin to pack-objects

2014-03-11 Thread Nguyễn Thái Ngọc Duy
Before cdab485 (upload-pack: delegate rev walking in shallow fetch to pack-objects - 2013-08-16) upload-pack does not write to the source repository. cdab485 starts to write $GIT_DIR/shallow_XX if it's a shallow fetch, so the source repo must be writable. git:// servers do not need write

[GSOC] Git Configuration API improvements

2014-03-11 Thread karthik nayak
Hello to all, I'm Karthik Nayak, a Computer Science student from Bangalore India. I will be applying for GSOC 2014. This is my first time applying for GSOC. I have been using Git for a long time now, so it would be an ideal organisation for me to contribute to. As suggested I completed the Micro

[PATCH v3] install_branch_config: simplify verbose diagnostic logic

2014-03-11 Thread Paweł Wawruch
Replace the chain of if statements with table of strings. Signed-off-by: Paweł Wawruch pa...@aleg.pl --- I changed the commit message. Logic of table has changed. To make it more clear I added three dimensions of the table. [1]: http://thread.gmane.org/gmane.comp.version-control.git/243502 [2]:

Re: question about: Facebook makes Mercurial faster than Git

2014-03-11 Thread Ondřej Bílka
On Mon, Mar 10, 2014 at 10:56:51AM -0700, David Lang wrote: On Mon, 10 Mar 2014, Ondřej Bílka wrote: On Mon, Mar 10, 2014 at 03:13:45AM -0700, David Lang wrote: On Mon, 10 Mar 2014, Dennis Luehring wrote: according to these blog posts

Re: [GSOC] Git Configuration API improvements

2014-03-11 Thread Matthieu Moy
karthik nayak karthik@gmail.com writes: Currently we have multiple invocation of git_config() in an individual invocation of git() which is not efficient. Also, it is hard to implement new features, I think efficiency is not a real concern here. Config files are small and easy to parse,

Re: [GSOC] Git Configuration API improvements

2014-03-11 Thread karthik nayak
On Tue, Mar 11, 2014 at 8:21 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: karthik nayak karthik@gmail.com writes: Currently we have multiple invocation of git_config() in an individual invocation of git() which is not efficient. Also, it is hard to implement new features, I

Re: [GSoC14][RFC] Proposal Draft: Refactor tempfile handling

2014-03-11 Thread Michael Haggerty
On 03/01/2014 10:04 PM, Brian Gesiak wrote: Hello all, My name is Brian Gesiak. I'm a research student at the University of Tokyo, and I'm hoping to participate in this year's Google Summer of Code by contributing to Git. I'm a longtime user, first-time contributor--some of you may have

[PATCH] status merge: guarentee space between msg and path

2014-03-11 Thread Sandy Carter
Add space between how and one when printing status of unmerged data. This fixes an appending of the how message when it is longer than 20. This is the case in some translations such as the french one where the colon gets appended to the file: supprimé par nous :wt-status.c modifié des

Re: [PATCH/RFC] git-gui: Add a 'recursive' checkbox in the clone menu.

2014-03-11 Thread Jens Lehmann
Am 11.03.2014 12:07, schrieb Henri GEIST: Le mercredi 05 mars 2014 à 19:00 +0100, Jens Lehmann a écrit : Am 05.03.2014 00:01, schrieb Henri GEIST: Permit to do a 'git clone --recursive' through git-gui. I really like where this is heading! Some minor issues: - I think we should be more

Re: [PATCH 7/7] run-command: mark run_hook_with_custom_index as deprecated

2014-03-11 Thread Benoit Pierre
On Tue, Mar 11, 2014 at 2:00 AM, brian m. carlson sand...@crustytoothpaste.net wrote: On Mon, Mar 10, 2014 at 07:49:37PM +0100, Benoit Pierre wrote: --- run-command.h | 1 + 1 file changed, 1 insertion(+) diff --git a/run-command.h b/run-command.h index 88460f9..3653bfa 100644 ---

Re: [PATCH 4/7] commit: fix patch hunk editing with commit -p -m

2014-03-11 Thread Benoit Pierre
On Mon, Mar 10, 2014 at 9:07 PM, Jeff King p...@peff.net wrote: On Mon, Mar 10, 2014 at 07:49:34PM +0100, Benoit Pierre wrote: Don't change git environment: move the GIT_EDITOR=: override to the hook command subprocess, like it's already done for GIT_INDEX_FILE. [...] This is a lot of

Re: [PATCH 4/7] commit: fix patch hunk editing with commit -p -m

2014-03-11 Thread Jeff King
On Tue, Mar 11, 2014 at 06:56:02PM +0100, Benoit Pierre wrote: According to the original commit, the change to GIT_EDITOR is only here for hooks: commit 406400ce4f69e79b544dd3539a71b85d99331820 Author: Paolo Bonzini bonz...@gnu.org Date: Tue Feb 5 11:01:45 2008 +0100 git-commit:

Re: [GSoC14][RFC] Proposal Draft: Refactor tempfile handling

2014-03-11 Thread Jeff King
On Tue, Mar 11, 2014 at 05:27:05PM +0100, Michael Haggerty wrote: Thanks for your proposal. I have a technical point that I think your proposal should address: Currently the linked list of lockfiles only grows, never shrinks. Once an object has been linked into the list, there is no way

Re: [PATCH 3/7] test patch hunk editing with commit -p -m

2014-03-11 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: On Mon, Mar 10, 2014 at 2:49 PM, Benoit Pierre benoit.pie...@gmail.com wrote: Add (failing) test: with commit changing the environment to let hooks now that no editor will be used (by setting GIT_EDITOR to :), the edit hunk functionality does

[PATCH v2] git-gui: Add a 'recursive' checkbox in the clone menu.

2014-03-11 Thread Henri GEIST
Permit to do a 'git clone --recursive' through git-gui. Add a 'recursive' checkbox in the clone menu which allows users to clone a repository and all its submodules in one go (unless the 'update' flag is set to none in the .gitmodules file for a submodule, in that case that specific submodule is

Re: [PATCH 4/7] commit: fix patch hunk editing with

2014-03-11 Thread Jun Hao
Jeff King peff at peff.net writes: Ah, you're right. I was thinking that our invocation of launch_editor also respected it. It does, but we never get there at all because use_editor is set to 0. So yeah, it really is just needed for the hook. Your patch, even though it is a bigger change,

[PATCH] configure.ac: link with -liconv for locale_charset()

2014-03-11 Thread Dmitry Marakasov
On e.g. FreeBSD 10.x, the following situation is common: - there's iconv implementation in libc, which has no locale_charset() function - there's GNU libiconv installed from Ports Collection Git build process - detects that iconv is in libc and thus -liconv is not needed for it - detects

Re: [PATCH] rev-parse --parseopt: option argument name hints

2014-03-11 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Documentation on the whole argument parsing is quite short, so, I though, adding an example just to show how usage is generated would look like I am trying to make this feature look important than it is :) You already are by saying the Angle brackets

Re: [PATCH 0/2] fix status_printf_ln calls zero-length format warnings

2014-03-11 Thread Junio C Hamano
Jeff King p...@peff.net writes: Most of us who compile with -Wall decided a while ago to use -Wno-format-zero-length, because it really is a silly complaint (it assumes there are no side effects of the function besides printing the format string, which is obviously not true in this case).

Re: GSoC idea: allow git rebase --interactive todo lines to take options

2014-03-11 Thread Junio C Hamano
Jeff King p...@peff.net writes: I'd say keep it at this point. I think there _are_ some good ideas here, and part of a project is figuring out what is good. And part of the role of the mentor is applying some taste. Amen to that. I hope we have enough mentor-candidates with good taste,

Re: [PATCH v3 0/8] Hiding refs

2014-03-11 Thread Junio C Hamano
Jeff King p...@peff.net writes: I think the main flag of interest is giving an fnmatch pattern to limit the advertised refs. There could potentially be others, but I do not know of any offhand. One thing that comes to mind is where symrefs point at, which we failed to add the last time around

Re: [[RFC memory leak, v.2]] Minor memory leak fix

2014-03-11 Thread René Scharfe
Am 11.03.2014 13:36, schrieb Fredrik Gustafsson: Strbuf needs to be released even if it's locally declared. Signed-off-by: Fredrik Gustafsson iv...@iveqy.com --- archive.c | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/archive.c b/archive.c index

Re: [RFC memory leak?] Minor memory leak fix

2014-03-11 Thread Junio C Hamano
Fredrik Gustafsson iv...@iveqy.com writes: On Tue, Mar 11, 2014 at 06:58:11PM +0700, Duy Nguyen wrote: On Tue, Mar 11, 2014 at 5:45 PM, Fredrik Gustafsson iv...@iveqy.com wrote: Strbuf needs to be released even if it's locally declared. path is declared static. So yes it's a leak but the

Re: [PATCH v3] install_branch_config: simplify verbose diagnostic logic

2014-03-11 Thread Junio C Hamano
Paweł Wawruch pa...@aleg.pl writes: Replace the chain of if statements with table of strings. Signed-off-by: Paweł Wawruch pa...@aleg.pl --- I changed the commit message. Logic of table has changed. To make it more clear I added three dimensions of the table. I am not sure if the message

Re: [PATCH] status merge: guarentee space between msg and path

2014-03-11 Thread Junio C Hamano
Sandy Carter sandy.car...@savoirfairelinux.com writes: diff --git a/wt-status.c b/wt-status.c index a452407..69e0dfc 100644 --- a/wt-status.c +++ b/wt-status.c @@ -264,7 +264,7 @@ static void wt_status_print_unmerged_data(struct wt_status *s, case 6: how = _(both added:); break;

Re: [PATCH v3 0/8] Hiding refs

2014-03-11 Thread Jeff King
On Tue, Mar 11, 2014 at 12:32:37PM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: I think the main flag of interest is giving an fnmatch pattern to limit the advertised refs. There could potentially be others, but I do not know of any offhand. One thing that comes to

Re: [PATCH 03/26] t1400: Pass a legitimate newvalue to update command

2014-03-11 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: It seems to me that -z input will nearly always be machine-generated, so there is not much reason to accept the empty string as shorthand for zeros. So I think that my version of the rules, being simpler to explain, is a slight improvement. But

Re: Re: [PATCH] submodule : Add --no-separate-git-dir option to add and update command.

2014-03-11 Thread Heiko Voigt
On Tue, Mar 11, 2014 at 10:55:03AM +0100, Henri GEIST wrote: Le lundi 10 mars 2014 à 21:32 +0100, Heiko Voigt a écrit : On Mon, Mar 10, 2014 at 10:08:06AM +0100, Henri GEIST wrote: Le samedi 08 mars 2014 à 00:00 +0100, Jens Lehmann a écrit : Am 06.03.2014 23:20, schrieb Henri GEIST:

Re: [PATCH] status merge: guarentee space between msg and path

2014-03-11 Thread Sandy Carter
Le 2014-03-11 15:59, Junio C Hamano a écrit : Sandy Carter sandy.car...@savoirfairelinux.com writes: diff --git a/wt-status.c b/wt-status.c index a452407..69e0dfc 100644 --- a/wt-status.c +++ b/wt-status.c @@ -264,7 +264,7 @@ static void wt_status_print_unmerged_data(struct wt_status *s,

Re: [PATCH v3 0/8] Hiding refs

2014-03-11 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Mar 11, 2014 at 12:32:37PM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: I think the main flag of interest is giving an fnmatch pattern to limit the advertised refs. There could potentially be others, but I do not know of any

Re: [PATCH] status merge: guarentee space between msg and path

2014-03-11 Thread Junio C Hamano
Sandy Carter sandy.car...@savoirfairelinux.com writes: Le 2014-03-11 15:59, Junio C Hamano a écrit : Sandy Carter sandy.car...@savoirfairelinux.com writes: diff --git a/wt-status.c b/wt-status.c index a452407..69e0dfc 100644 --- a/wt-status.c +++ b/wt-status.c @@ -264,7 +264,7 @@ static

Re: [PATCH][GSOC2014] changed logical chain in branch.c to lookup tables

2014-03-11 Thread Eric Sunshine
Thanks for the resubmission. Comments below. On Tue, Mar 11, 2014 at 7:33 AM, Tamer TAS tamer...@outlook.com wrote: Subject: changed logical chain in branch.c to lookup tables Use imperative tone: change rather than changed Prefix the message with the part of the project you are touching. So,

Re: [PATCH] configure.ac: link with -liconv for locale_charset()

2014-03-11 Thread Junio C Hamano
Dmitry Marakasov amd...@amdmi3.ru writes: On e.g. FreeBSD 10.x, the following situation is common: - there's iconv implementation in libc, which has no locale_charset() function - there's GNU libiconv installed from Ports Collection Git build process - detects that iconv is in libc and

Re: [PATCH v3 0/8] Hiding refs

2014-03-11 Thread Jeff King
On Tue, Mar 11, 2014 at 01:25:23PM -0700, Junio C Hamano wrote: Yeah, good idea. I might be misremembering some complications, but we can probably do it with: 1. Teach the client to send an advertise-symrefs flag before the ref advertisement. 2. Teach the server to include

Re: [PATCH 4/7] commit: fix patch hunk editing with commit -p -m

2014-03-11 Thread Junio C Hamano
Benoit Pierre benoit.pie...@gmail.com writes: diff --git a/builtin/checkout.c b/builtin/checkout.c index 5df3837..da423b2 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -53,10 +53,10 @@ struct checkout_opts { static int post_checkout_hook(struct commit *old, struct commit

Re: [PATCH 3/7] test patch hunk editing with commit -p -m

2014-03-11 Thread Junio C Hamano
Benoit Pierre benoit.pie...@gmail.com writes: Add (failing) test: with commit changing the environment to let hooks now that no editor will be used (by setting GIT_EDITOR to :), the edit hunk functionality does not work (no editor is launched and the whole hunk is committed). Signed-off-by:

[PATCH 1/2] t7810: add missing variables to tests in loop

2014-03-11 Thread René Scharfe
Some tests in t7810-grep.sh are in a loop that runs them against HEAD and the work tree. In order for that to work the test code should use the variables $L (display name), $H (HEAD or empty string) and $HC (revision prefix for result lines); otherwise tests are just repeated with the same

[PATCH 2/2] grep: support -h (no header) with --count

2014-03-11 Thread René Scharfe
Suppress printing the header (filename) with -h even if in -c/--count mode. GNU grep and OpenBSD's grep do the same. Signed-off-by: Rene Scharfe l@web.de --- grep.c | 7 +-- t/t7810-grep.sh | 12 2 files changed, 17 insertions(+), 2 deletions(-) diff --git

git $Id$ smudge filter

2014-03-11 Thread shawn wilson
Currently, I've got a perl script that modifies the Id line in a smudge filter: [filter ident-line] smudge = /usr/local/bin/githook_ident-filter.pl %f The problem I've noticed with smudge filters is that it leaves the repo dirty. How do I fix this? I am basically trying to replicate the

Re: [PATCH 03/26] t1400: Pass a legitimate newvalue to update command

2014-03-11 Thread Brad King
On Tue, Mar 11, 2014 at 4:06 PM, Junio C Hamano gits...@pobox.com wrote: I may be misremembering things, but your first sentence quoted above was exactly my reaction while reviewing the original change, and I might have even raised that as an issue myself, saying something like consistency

Re: [PATCH] mv: prevent mismatched data when ignoring errors.

2014-03-11 Thread Junio C Hamano
brian m. carlson sand...@crustytoothpaste.net writes: We shrink the source and destination arrays, but not the modes or submodule_gitfile arrays, resulting in potentially mismatched data. Shrink all the arrays at the same time to prevent this. Signed-off-by: brian m. carlson

Re: git $Id$ smudge filter

2014-03-11 Thread Junio C Hamano
shawn wilson ag4ve...@gmail.com writes: Currently, I've got a perl script that modifies the Id line in a smudge filter: [filter ident-line] smudge = /usr/local/bin/githook_ident-filter.pl %f The problem I've noticed with smudge filters is that it leaves the repo dirty. How do I fix

Re: [PATCH] implement submodule config cache for lookup of submodule names

2014-03-11 Thread Jeff King
On Mon, Mar 10, 2014 at 10:24:12PM +0100, Heiko Voigt wrote: I have also moved all functions into the new submodule-config-cache module. I am not completely satisfied with the naming since it is quite long. If someone comes up with some different naming I am open for it. Maybe simply

Re: Re: [PATCH] submodule : Add --no-separate-git-dir option to add and update command.

2014-03-11 Thread Henri GEIST
Le mardi 11 mars 2014 à 21:11 +0100, Heiko Voigt a écrit : On Tue, Mar 11, 2014 at 10:55:03AM +0100, Henri GEIST wrote: Le lundi 10 mars 2014 à 21:32 +0100, Heiko Voigt a écrit : On Mon, Mar 10, 2014 at 10:08:06AM +0100, Henri GEIST wrote: Le samedi 08 mars 2014 à 00:00 +0100, Jens

What's cooking in git.git (Mar 2014, #02; Tue, 11)

2014-03-11 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'. Topics that have been cooking in 'next' for 2.0 have been merged to 'master', which means we are committed to make the next one a big release.

Re: [PATCH] configure.ac: link with -liconv for locale_charset()

2014-03-11 Thread Dmitry Marakasov
* Junio C Hamano (gits...@pobox.com) wrote: On e.g. FreeBSD 10.x, the following situation is common: - there's iconv implementation in libc, which has no locale_charset() function - there's GNU libiconv installed from Ports Collection Git build process - detects that iconv is in

[PATCH] sh-i18n--envsubst: retire unused string_list_member()

2014-03-11 Thread Eric Sunshine
This static function has no callers, nor has it had any since its introduction in ba67aaf2d05d (git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext(), 2011-05-14). Remove it. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- The latest Apple developer tools (just released) has

Re: [PATCH] configure.ac: link with -liconv for locale_charset()

2014-03-11 Thread Дилян Палаузов
Hello, this changes effectively the meaning of CHARSET_LIB to always/unconditionally contain the library with the charset_locale () function. The snippet at the end of the email updates the description in /Makefile . However, I checked now how gnulib deals with locale_charset (). Contary

Re: An idea for git bisect and a GSoC enquiry

2014-03-11 Thread Jacopo Notarstefano
On Mon, Mar 3, 2014 at 7:34 PM, Junio C Hamano gits...@pobox.com wrote: I think you fundamentally cannot use two labels that are merely distinct and bisect correctly. You need to know which ones (i.e. good) are to be excluded and the other (i.e. bad) are to be included when computing the

[PATCH v4] install_branch_config: simplify verbose messages logic

2014-03-11 Thread Paweł Wawruch
Replace the chain of if statements with table of strings. Signed-off-by: Paweł Wawruch pa...@aleg.pl --- The changes proposed by Junio C Hamano: Improvement of indentations. Removed an unused variable. [1]: http://thread.gmane.org/gmane.comp.version-control.git/243502 [2]:

Re: [PATCH] status merge: guarentee space between msg and path

2014-03-11 Thread Duy Nguyen
On Wed, Mar 12, 2014 at 3:26 AM, Junio C Hamano gits...@pobox.com wrote: Sandy Carter sandy.car...@savoirfairelinux.com writes: Le 2014-03-11 15:59, Junio C Hamano a écrit : Sandy Carter sandy.car...@savoirfairelinux.com writes: diff --git a/wt-status.c b/wt-status.c index a452407..69e0dfc

Re: [PATCH] configure.ac: link with -liconv for locale_charset()

2014-03-11 Thread Dmitry Marakasov
* Junio C Hamano (gits...@pobox.com) wrote: Looks sensible; Dilyan, any comments? Another addendum, comment from Tijl Coosemans t...@freebsd.org who just fixed this problem in FreeBSD ports (differently): --- Please let upstream know they should either use iconv from libc + nl_langinfo from

[PATCH v2] status merge: guarentee space between msg and path

2014-03-11 Thread Sandy Carter
Add space between how and one when printing status of unmerged data. This fixes an appending of the how message when it is longer than 20, such is the case in some translations such as the french one where the colon gets appended to the file: supprimé par nous :wt-status.c modifié des

Re: What's cooking in git.git (Mar 2014, #02; Tue, 11)

2014-03-11 Thread Duy Nguyen
On Wed, Mar 12, 2014 at 5:12 AM, Junio C Hamano gits...@pobox.com wrote: * nd/log-show-linear-break (2014-02-10) 1 commit - log: add --show-linear-break to help see non-linear history Attempts to show where a single-strand-of-pearls break in git log output. Will merge to 'next'. Hold

Re: [PATCH] implement submodule config cache for lookup of submodule names

2014-03-11 Thread Jonathan Nieder
Hi, Some quick thoughts. Heiko Voigt wrote: This submodule configuration cache allows us to lazily read .gitmodules configurations by commit into a runtime cache which can then be used to easily lookup values from it. Currently only the values for path or name are stored but it can be

Borrowing objects from nearby repositories

2014-03-11 Thread Andrew Keller
Hi all, I am considering developing a new feature, and I'd like to poll the group for opinions. Background: A couple years ago, I wrote a set of scripts that speed up cloning of frequently used repositories. The scripts utilize a bare Git repository located at a known location, and automate

[PATCH] SoC 2014 MicroProject No.8:change multiple if-else statement to table-driven approach

2014-03-11 Thread Yao Zhao
Signed-off-by: Yao Zhao zhaox...@umn.edu --- branch.c | 55 +-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/branch.c b/branch.c index 723a36b..6432e27 100644 --- a/branch.c +++ b/branch.c @@ -53,7 +53,20 @@ void

Re: [PATCH v4] install_branch_config: simplify verbose messages logic

2014-03-11 Thread Eric Sunshine
On Tue, Mar 11, 2014 at 8:33 PM, Paweł Wawruch pa...@aleg.pl wrote: Replace the chain of if statements with table of strings. Signed-off-by: Paweł Wawruch pa...@aleg.pl --- The changes proposed by Junio C Hamano: Improvement of indentations. Removed an unused variable. Better, thanks. More