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

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

Re: [RFC 3/3] reset: Change the default behavior to use "--merge" during a merge

2014-03-10 Thread Andrew Wong
On 02/26/14 15:53, Junio C Hamano wrote: > - start warning against "reset" (no mode specifier) and "reset --mixed" >when the index is unmerged *and* MERGE_HEAD exists; and then Why do we also want to check if index is unmerged? This situation can happen regardless of having conflicts or not (-

[PATCH] Documentation/git-am: Document supported --patch-format options

2014-03-10 Thread Chris Packham
The --patch-format option has been supported for a while but it is not mentioned in the man page and the short help cannot tell the user what the supported formats are. Add the option to the man page along with the supported options. Signed-off-by: Chris Packham --- I've not bothered to actually

Fitted K*itchens North London

2014-03-10 Thread gelaan
Fitted K*itchens North London w w w . e x d i s p l a y k i t c h e n s 1 . c o . u k. Fitted K*itchens in North London for only £595 including appliances. Full fitted K*itchens only £595. Fitted K*itchens North London - Fitted Kitchens North London -- View this message in context: http

Kitchen Designers Newcastle

2014-03-10 Thread uasiin
Ki tch en Designers Newcastle. Thirty Ex Display Ki tch ens To Clear. w w w . e x d i s p l a y k i t c h e n s 1 . c o . u k £ 595 Each with appliances. - Kitchen Designers Newcastle -- View this message in context: http://git.661346.n2.nabble.com/Kitchen-Designers-Newcastle-tp7605389.ht

K*it c h e n Sales Sheffield

2014-03-10 Thread simply07
K*it c h e n Sales Sheffield w w w.e x d i s p l a y k i t c h e n s 1.c o.u k . Cheap K*it c h e n sale Sheffield. Full K*it c h e n in Sheffield £595 including appliances. Cheap K*it c h e n sale Sheffield. Cheapest K*it c h e n sale in Sheffield - Kitchen Sales Sheffield -- View th

Re: [RFC/WIP] Pluggable reference backends

2014-03-10 Thread Shawn Pearce
On Mon, Mar 10, 2014 at 2:07 PM, Michael Haggerty wrote: > On 03/10/2014 04:52 PM, Jeff King wrote: >> On Mon, Mar 10, 2014 at 07:30:45AM -0700, Shawn Pearce wrote: >> * Store references in a SQLite database, to get correct transaction handling. >>> >>> No to SQLLite in git-core. Using

Tesco K*itchens Reviews

2014-03-10 Thread gantitrs
Tesco K*itchens Reviews , Go to w w w.t e s c o k i t c h e n s r e v i e w s.c o.u k - Tesco Kitchens Reviews -- View this message in context: http://git.661346.n2.nabble.com/Tesco-K-itchens-Reviews-tp7605386.html Sent from the git mailing list archive at Nabble.com. -- To unsubscribe f

K*i t c h e n Designer London

2014-03-10 Thread positively
K*i t c h e n Designer London. Thirty Ex D1splay K*i t c h e n s To Clear. W w w . e x d I s p la y k I t ch e n s 1 . c o .u k £ 595 Each with appliances. -- View this message in context: http://git.661346.n2.nabble.com/K-i-t-c-h-e-n-Designer-London-tp7605385.html Sent from the git mailing

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

2014-03-10 Thread brian m. carlson
On Mon, Mar 10, 2014 at 09:56:03PM -0400, Jeff King wrote: > On Sat, Mar 08, 2014 at 07:21:39PM +, brian m. carlson wrote: > > > We shrink the source and destination arrays, but not the modes or > > submodule_gitfile arrays, resulting in potentially mismatched data. Shrink > > all the arrays

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

2014-03-10 Thread Jeff King
On Sat, Mar 08, 2014 at 07:21:39PM +, brian m. carlson wrote: > 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. carlso

Re: [PATCH v3 0/8] Hiding refs

2014-03-10 Thread Jeff King
On Sun, Feb 23, 2014 at 09:44:14AM +0700, Duy Nguyen wrote: > (Digging up an old thread about initial refs listing in git protocol) And now I am responding to it slowly. :) > > For that to work, the new server needs to wait for the client to > > speak first. How would that server handle old cli

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

2014-03-10 Thread Jeff King
On Fri, Feb 28, 2014 at 03:03:52PM +0100, Michael Haggerty wrote: > > I'm not sure whether it is a good idea or not. But I think it is looking > > decreasingly like a good GSoC project. > > I guess I misread the sentiment of the mailing list, because I merged > this idea into the list about two h

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

2014-03-10 Thread Jeff King
On Sun, Mar 09, 2014 at 02:04:16AM +0900, Brian Gesiak wrote: > > Once the logic is extracted into a nice API, there are > > several other places that can use it, too: ... > > I've found the following four areas so far: > > 1. lockfile.lock_file > 2. git-compat-util.odb_mkstemp > 3. git-compat-u

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

2014-03-10 Thread brian m. carlson
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 > --- a/run-command.h > +++ b/run-command.h > @@ -51,6 +51,7 @@ extern int run_hook_le(const

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

2014-03-10 Thread Jun Hao
Jeff King writes: > 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. >> >> Signed-off-by: Benoit Pierre >> --- >> builtin/checkout.c

Re: [PATCH][GSoC] branch.c:install_branch_config Simplified long chain of if statements

2014-03-10 Thread Vincenzo di Cicco
Thank you very much for the answer! I've learned a lot in this few rows. > If we take the time to trace through the code, we can see that > remote_is_branch is indeed either 0 or 1, thus this expression is safe > today, however, if the implementation of starts_with() ever changes so > that it retu

Re: Fwd: git-reviewed: linking commits to review discussion in git

2014-03-10 Thread Peter C Rigby
On Tue, Feb 18, 2014 at 12:28 AM, Jeff King wrote: [snip] > > 3. How do we present the emails to the user (including showing > threads, letting them dig deeper, etc)? We created a website, you enter a commit and it shows you the reviews: http://cesel.encs.concordia.ca/process_request.php?r

Re: [PATCH][GSoC] branch.c:install_branch_config Simplified long chain of if statements

2014-03-10 Thread Eric Sunshine
Thanks for the submission. Comments below to give you a feel for the Git review process... On Mon, Mar 10, 2014 at 6:04 PM, Vincenzo di Cicco wrote: > From: NaN Drop this line unless it is intentionally different from your email From: header, which "git am" will pick up automatically when apply

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

2014-03-10 Thread Eric Sunshine
On Mon, Mar 10, 2014 at 5:47 PM, Tamer TAS wrote: > Eric Sunshine wrote >> Even allowing internationalization of them (via N_() in the location[] >> and type[] tables) might not be sufficient since grammatical rules >> differ from language to language. > > I didn't fully understand what you meant

[PATCH][GSoC] branch.c:install_branch_config Simplified long chain of if statements

2014-03-10 Thread Vincenzo di Cicco
From: NaN Hi there, I've made this patch in according to the rules to participate at GSoC. I've seen other patches about this issue very well constructed, so this is only another way to solve this microproject and to test how I can send a patch and discuss about it. Thanks, NaN Signed-off-by:

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

2014-03-10 Thread Tamer TAS
Eric Sunshine wrote > Even allowing internationalization of them (via N_() in the location[] > and type[] tables) might not be sufficient since grammatical rules > differ from language to language. I didn't fully understand what you meant by that. Since they were being internationalized before usi

Re: [PATCH 00/26] Clean up update-refs --stdin and implement ref_transaction

2014-03-10 Thread Michael Haggerty
On 03/10/2014 06:44 PM, Brad King wrote: > [...] Thanks for your kind words. > On 03/10/2014 08:46 AM, Michael Haggerty wrote: >> The new API for dealing with reference transactions is >> >> ref_transaction *transaction = create_ref_transaction(); >> queue_create_ref(transaction, refname,

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

2014-03-10 Thread Michael Haggerty
Brad, Thanks for your feedback. On 03/10/2014 06:03 PM, Brad King wrote: > On 03/10/2014 08:46 AM, Michael Haggerty wrote: >> This test is trying to test a few ways to delete references using "git >> update-ref -z --stdin". The third line passed in is >> >> update SP /refs/heads/c NUL NUL N

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

2014-03-10 Thread Heiko Voigt
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 extended for any value needed. It is expected that .gitm

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

2014-03-10 Thread Eric Sunshine
On Mon, Mar 10, 2014 at 3:04 PM, TamerTas wrote: > Signed-off-by: TamerTas Thanks for the submission. It appears to be well executed. Read below for a concern about the approach taken. > --- > branch.c | 31 --- > 1 file changed, 8 insertions(+), 23 deletions(-) >

Re: [PATCH] [GSOC] branch.c: install_branch_config: simplify if chain

2014-03-10 Thread Eric Sunshine
On Mon, Mar 10, 2014 at 1:32 AM, Adam wrote: > Simplify if chain in install_branch_config(). Nicely done. Whether the rewritten code is indeed simpler is probably a matter of taste, however, the submission itself is well executed. > Signed-off-by: Adam On this project, use your full name if po

Re: [RFC/WIP] Pluggable reference backends

2014-03-10 Thread Michael Haggerty
On 03/10/2014 04:52 PM, Jeff King wrote: > On Mon, Mar 10, 2014 at 07:30:45AM -0700, Shawn Pearce wrote: > >>> * Store references in a SQLite database, to get correct transaction >>> handling. >> >> No to SQLLite in git-core. Using it from JGit requires building >> SQLLite and a JNI wrapper, whi

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

2014-03-10 Thread Stefan Beller
On 10.03.2014 20:04, TamerTas wrote: > > Signed-off-by: TamerTas > --- > branch.c | 31 --- > 1 file changed, 8 insertions(+), 23 deletions(-) > > diff --git a/branch.c b/branch.c > index 723a36b..397edd3 100644 > --- a/branch.c > +++ b/branch.c > @@ -50,6 +50,9 @@

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

2014-03-10 Thread Eric Sunshine
On Mon, Mar 10, 2014 at 3:58 AM, Nemina Amarasinghe wrote: > Nemina Amarasinghe gmail.com> writes: > > Sorry for the first patch. Something went wrong. This is the correct one In addition to the tautological issue pointed out by Matthieu, please note that this version of the patch is not the cor

Re: [PATCH] clean: respect pathspecs with "-d"

2014-03-10 Thread Jeff King
On Mon, Mar 10, 2014 at 09:02:35PM +0100, Simon Ruderich wrote: > On Mon, Mar 10, 2014 at 01:22:15PM -0400, Jeff King wrote: > > +test_expect_success 'git clean -d respects pathspecs' ' > > + mkdir foo && > > + mkdir foobar && > > + git clean -df foobar && > > + test_path_is_dir foo && > >

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

2014-03-10 Thread Heiko Voigt
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 > > >> not be handled by adding "subsubmodule" inside "submo

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

2014-03-10 Thread Philip Oakley
mincro nit. From: "Benoit Pierre" Add (failing) test: with commit changing the environment to let hooks now that no editor will be used (by setting GIT_EDITOR to ":"), the s/now/know/ "edit hunk" functionality does not work (no editor is launched and the whole hunk is committed). Signed-off-

Re: [PATCH 6/7] merge hook tests: fix and update tests

2014-03-10 Thread Eric Sunshine
On Mon, Mar 10, 2014 at 2:49 PM, Benoit Pierre wrote: > - update 'no editor' hook test and add 'editor' hook test > - make sure the tree is reset to a clean state after running a test > (using test_when_finished) so later tests are not impacted As conceptually distinct changes, it might make se

Re: question about: Facebook makes Mercurial faster than Git

2014-03-10 Thread Martin Langhoff
On Mon, Mar 10, 2014 at 1:56 PM, David Lang wrote: > there's also the issue of managed vs generated files, if you update the > mtime all the way up the tree because a source file was compiled and a > binary created, that will quickly defeat the value of the recursive mime. I think this points us

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

2014-03-10 Thread Eric Sunshine
On Mon, Mar 10, 2014 at 2:49 PM, Benoit Pierre 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 not work (no editor is launched and the > whole hunk is committed). >

Re: [PATCH 1/2] status: allow NULL fmt for status_printf/status_vprintf_ln

2014-03-10 Thread Eric Sunshine
On Mon, Mar 10, 2014 at 3:27 PM, Benoit Pierre wrote: > Useful for calling status_printf only to change/reset the color (and > output an additional '\n' with status_vprintf_ln). > > Signed-off-by: Benoit Pierre > --- > wt-status.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > dif

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

2014-03-10 Thread Jeff King
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. > > Signed-off-by: Benoit Pierre > --- > builtin/checkout.c| 8 +++ >

Re: [PATCH] clean: respect pathspecs with "-d"

2014-03-10 Thread Simon Ruderich
On Mon, Mar 10, 2014 at 01:22:15PM -0400, Jeff King wrote: > +test_expect_success 'git clean -d respects pathspecs' ' > + mkdir foo && > + mkdir foobar && > + git clean -df foobar && > + test_path_is_dir foo && > + test_path_is_missing foobar > +' > + > test_done I think we sh

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

2014-03-10 Thread Junio C Hamano
Johannes Sixt writes: > Am 3/5/2014 1:10, schrieb Junio C Hamano: >> * nd/gitignore-trailing-whitespace (2014-02-10) 2 commits >> - dir: ignore trailing spaces in exclude patterns >> - dir: warn about trailing spaces in exclude patterns >> >> Warn and then ignore trailing whitespaces in .giti

Re: [RFC/WIP] Pluggable reference backends

2014-03-10 Thread David Kastrup
Jeff King writes: > On Mon, Mar 10, 2014 at 05:14:02PM +0100, David Kastrup wrote: > >> [storing refs in sqlite] >> >> Of course, the basic premise for this feature is "let's assume that our >> file and/or operating system suck at providing file system functionality >> at file name granularity".

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

2014-03-10 Thread Junio C Hamano
Ilya Bobyr writes: > On 3/4/2014 11:22 AM, Junio C Hamano wrote: >> Ilya Bobyr writes: >>> @@ -333,6 +339,7 @@ h,helpshow the help >>> foo some nifty option --foo >>> bar= some cool option --bar with an argument >>> +baz=arg another cool option --baz with an argument named

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

2014-03-10 Thread Jeff King
On Mon, Mar 10, 2014 at 08:27:25PM +0100, Benoit Pierre wrote: > Those happens with "gcc -Wformat-zero-length". Since passing NULL does not > generate a warning (as __attribute__((printf())) does not imply nonull), > modify > status_printf/status_printf_ln to allow a NULL format and update calls

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

2014-03-10 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy 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 paranoid mode so either I enable it > for all squashes and fixups, or none. Hence a new o

Re: [RFC/WIP] Pluggable reference backends

2014-03-10 Thread Jeff King
On Mon, Mar 10, 2014 at 05:14:02PM +0100, David Kastrup wrote: > [storing refs in sqlite] > > Of course, the basic premise for this feature is "let's assume that our > file and/or operating system suck at providing file system functionality > at file name granularity". There have been two histori

Re: [PATCH/RFC] Documentation: Say that submodule clones use a separate gitdirs.

2014-03-10 Thread Junio C Hamano
Henri GEIST writes: > Le lundi 10 mars 2014 à 08:31 -0700, Junio C Hamano a écrit : > ... >> This is not limited to submodules. There are multiple lower-level >> mechanisms for a $path/.git to borrow the repository data from >> elsewhere outside of $path and a cloned submodule uses only one of >

[PATCH 2/2] fix status_printf_ln calls "zero-length format" warnings

2014-03-10 Thread Benoit Pierre
Those happens with "gcc -Wformat-zero-length". Change empty strings to NULL now that it's allowed. Signed-off-by: Benoit Pierre --- builtin/commit.c | 2 +- wt-status.c | 20 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/builtin/commit.c b/builtin/c

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

2014-03-10 Thread Benoit Pierre
Those happens with "gcc -Wformat-zero-length". Since passing NULL does not generate a warning (as __attribute__((printf())) does not imply nonull), modify status_printf/status_printf_ln to allow a NULL format and update calls with an empty string. Benoit Pierre (2): status: allow NULL fmt for st

[PATCH 1/2] status: allow NULL fmt for status_printf/status_vprintf_ln

2014-03-10 Thread Benoit Pierre
Useful for calling status_printf only to change/reset the color (and output an additional '\n' with status_vprintf_ln). Signed-off-by: Benoit Pierre --- wt-status.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wt-status.c b/wt-status.c index 4e55810..17f63a4 100644 --- a

[PATCH][GSOC2014]

2014-03-10 Thread TamerTas
I inspected branch.c:install_branch_config() and since the conditionals cover all the possibilities, I decided that making the code table-driven would be much cleaner and shorter. I've ran the tests and they all passed. Reimplementation using "git am" also didn't have any problems. Please let me k

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

2014-03-10 Thread TamerTas
Signed-off-by: TamerTas --- branch.c | 31 --- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/branch.c b/branch.c index 723a36b..397edd3 100644 --- a/branch.c +++ b/branch.c @@ -50,6 +50,9 @@ static int should_setup_rebase(const char *origin) void i

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

2014-03-10 Thread Benoit Pierre
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: Benoit Pierre --- t/t7513-commit_-p_-m_hunk_ed

[PATCH 5/7] merge: fix GIT_EDITOR override for commit hook

2014-03-10 Thread Benoit Pierre
Don't set GIT_EDITOR to ":" when calling prepare-commit-msg hook if the editor is going to be called (e.g. with "merge -e"). Signed-off-by: Benoit Pierre --- builtin/merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/merge.c b/builtin/merge.c index 67f312d..b11a5

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

2014-03-10 Thread Benoit Pierre
--- run-command.h | 1 + 1 file changed, 1 insertion(+) diff --git a/run-command.h b/run-command.h index 88460f9..3653bfa 100644 --- a/run-command.h +++ b/run-command.h @@ -51,6 +51,7 @@ extern int run_hook_le(const char *const *env, const char *name, ...); extern int run_hook_ve(const char *co

[PATCH 2/7] merge hook tests: use 'test_must_fail' instead of '!'

2014-03-10 Thread Benoit Pierre
Signed-off-by: Benoit Pierre --- t/t7505-prepare-commit-msg-hook.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh index 1c95652..5531abb 100755 --- a/t/t7505-prepare-commit-msg-hook.sh +++ b/t/t7505

[PATCH V2 0/7] fix hunk editing with 'commit -p -m'

2014-03-10 Thread Benoit Pierre
This patch fixes the fact that hunk editing with 'commit -p -m' does not work: GIT_EDITOR is set to ':' to indicate to hooks that no editor will be launched, which result in the 'hunk edit' option not launching the editor (and selecting the whole hunk). The fix consists in deferring the GIT_EDITOR

[PATCH 6/7] merge hook tests: fix and update tests

2014-03-10 Thread Benoit Pierre
- update 'no editor' hook test and add 'editor' hook test - make sure the tree is reset to a clean state after running a test (using test_when_finished) so later tests are not impacted Signed-off-by: Benoit Pierre --- t/t7505-prepare-commit-msg-hook.sh | 27 +-- 1 file

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

2014-03-10 Thread Benoit Pierre
Don't change git environment: move the GIT_EDITOR=":" override to the hook command subprocess, like it's already done for GIT_INDEX_FILE. Signed-off-by: Benoit Pierre --- builtin/checkout.c| 8 +++ builtin/clone.c | 4 ++-- builtin/commit.c

[PATCH 1/7] merge hook tests: fix missing '&&' in test

2014-03-10 Thread Benoit Pierre
Signed-off-by: Benoit Pierre --- t/t7505-prepare-commit-msg-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh index 3573751..1c95652 100755 --- a/t/t7505-prepare-commit-msg-hook.sh +++ b/t/t7505-pre

Re: [PATCH/RFC] Documentation: Say that submodule clones use a separate gitdirs.

2014-03-10 Thread Henri GEIST
Le lundi 10 mars 2014 à 08:31 -0700, Junio C Hamano a écrit : > Andrew Keller writes: > > > On Mar 7, 2014, at 7:50 PM, Henri GEIST wrote: > > ... > >> To give one of my project to someone else I have copied it on a USB key. > >> By a simple drag and drop with the mouse. > >> And I am quite sure

Re: question about: Facebook makes Mercurial faster than Git

2014-03-10 Thread Ondřej Bílka
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 > > > >http://www.infoq.com/news/2014/01/facebook-scaling-hg > >https://code.facebook.com/posts/218678814984400/scaling-mercurial-at-facebook/ > > > >mercuri

Re: question about: Facebook makes Mercurial faster than Git

2014-03-10 Thread David Lang
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 http://www.infoq.com/news/2014/01/facebook-scaling-hg https://code.facebook.com/posts/218678814984400/scaling-mercuri

Re: [RFC/WIP] Pluggable reference backends

2014-03-10 Thread Jeff King
On Mon, Mar 10, 2014 at 10:46:01AM -0700, Junio C Hamano wrote: > >> No to SQLLite in git-core. Using it from JGit requires building > >> SQLLite and a JNI wrapper, which makes JGit significantly less > >> portable. I know SQLLite is pretty amazing, but implementing > >> compatibility with it from

Re: [RFC/WIP] Pluggable reference backends

2014-03-10 Thread Junio C Hamano
Jeff King writes: > On Mon, Mar 10, 2014 at 07:30:45AM -0700, Shawn Pearce wrote: > >> > * Store references in a SQLite database, to get correct transaction >> > handling. >> >> No to SQLLite in git-core. Using it from JGit requires building >> SQLLite and a JNI wrapper, which makes JGit signi

Re: [PATCH 00/26] Clean up update-refs --stdin and implement ref_transaction

2014-03-10 Thread Brad King
Hi Michael, This is excellent work. I haven't reviewed every line of logic in detail but the changes look correct at a high level. The only exception is that the empty is supposed to be accepted and treated as zero even in "--stdin -z" mode. See my response to that individual change. On 03/10

[PATCH] clean: simplify dir/not-dir logic

2014-03-10 Thread Jeff King
On Mon, Mar 10, 2014 at 01:20:02PM -0400, Jeff King wrote: > git-clean uses read_directory to fill in a `struct dir` with > potential hits. However, read_directory does not actually > check against our pathspec. It uses a simplified version > that may turn up false positives. As a result, we need

Re: [PATCH] clean: respect pathspecs with "-d"

2014-03-10 Thread Jeff King
On Mon, Mar 10, 2014 at 01:20:02PM -0400, Jeff King wrote: > On Mon, Mar 10, 2014 at 11:31:37AM +0100, Robin Pedersen wrote: > > > I accidentially deleted a directory using git clean. I would think > > this is a bug, but I'm not sure. Was using 1.8.1, but upgraded to > > 1.9.0 just to see if it w

[PATCH] clean: respect pathspecs with "-d"

2014-03-10 Thread Jeff King
git-clean uses read_directory to fill in a `struct dir` with potential hits. However, read_directory does not actually check against our pathspec. It uses a simplified version that may turn up false positives. As a result, we need to check that any hits match our pathspec. We do so reliably for non

Re: [PATCH 13/26] update-ref --stdin: Simplify error messages for missing oldvalues

2014-03-10 Thread Brad King
On 03/10/2014 08:46 AM, Michael Haggerty wrote: > Instead of, for example, > > fatal: update refs/heads/master missing [] NUL > > emit > > fatal: update refs/heads/master missing [snip] > - die("update %s missing [] NUL", update->ref_name); > + die("update %s mis

Re: [PATCH 13/26] update-ref --stdin: Simplify error messages for missing oldvalues

2014-03-10 Thread Brad King
On 03/10/2014 01:08 PM, Brad King wrote: >> -die("update %s missing [] NUL", update->ref_name); >> +die("update %s missing ", update->ref_name); > > The reason for the original wording is that the is indeed > optional. This can only occur at end-of-input, and it is actual

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

2014-03-10 Thread Brad King
On 03/10/2014 08:46 AM, Michael Haggerty wrote: > This test is trying to test a few ways to delete references using "git > update-ref -z --stdin". The third line passed in is > > update SP /refs/heads/c NUL NUL NUL > > , which is not a correct way to delete a reference according to the > do

Re: [RFC/WIP] Pluggable reference backends

2014-03-10 Thread David Lang
On Mon, 10 Mar 2014, David Kastrup wrote: Jeff King writes: On Mon, Mar 10, 2014 at 07:30:45AM -0700, Shawn Pearce wrote: * Store references in a SQLite database, to get correct transaction handling. No to SQLLite in git-core. Using it from JGit requires building SQLLite and a JNI wrapp

Re: [RFC/WIP] Pluggable reference backends

2014-03-10 Thread David Kastrup
Jeff King writes: > On Mon, Mar 10, 2014 at 07:30:45AM -0700, Shawn Pearce wrote: > >> > * Store references in a SQLite database, to get correct transaction >> > handling. >> >> No to SQLLite in git-core. Using it from JGit requires building >> SQLLite and a JNI wrapper, which makes JGit signi

Re: [RFC/WIP] Pluggable reference backends

2014-03-10 Thread Jeff King
On Mon, Mar 10, 2014 at 07:30:45AM -0700, Shawn Pearce wrote: > > * Store references in a SQLite database, to get correct transaction > > handling. > > No to SQLLite in git-core. Using it from JGit requires building > SQLLite and a JNI wrapper, which makes JGit significantly less > portable. I

Re: [RFC/WIP] Pluggable reference backends

2014-03-10 Thread Max Horn
On 10.03.2014, at 15:30, Shawn Pearce wrote: > On Mon, Mar 10, 2014 at 4:00 AM, Michael Haggerty > wrote: >> I have started working on pluggable ref backends. In this email I >> would like to share my plans and solicit feedback. > > Yay! Yay, too! > JGit already has pluggable ref backends,

Re: [GSoC][PATCH v2] use strchrnul() in place of strchr() and strlen()

2014-03-10 Thread Junio C Hamano
Rohit Mani writes: > Avoid scanning strings twice, once with strchr() and then with > strlen(), by using strchrnul(). Thanks. The patch looks good. -- 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: [PATCH/RFC] Documentation: Say that submodule clones use a separate gitdirs.

2014-03-10 Thread Junio C Hamano
Andrew Keller writes: > On Mar 7, 2014, at 7:50 PM, Henri GEIST wrote: > ... >> To give one of my project to someone else I have copied it on a USB key. >> By a simple drag and drop with the mouse. >> And I am quite sure I am not alone doing this way. >> >> I have done those kind of things lot o

Re: [PATCH v7 00/11] Add interpret-trailers builtin

2014-03-10 Thread Junio C Hamano
Øystein Walle writes: > Junio C Hamano pobox.com> writes: > >> >> ... >> >> is easier to read and maintain if written like so (with using HT >> properly---our MUAs may damage it and turn the indentation into >> spaces): >> >> ... && >> sed -e "s/ Z$/ /" >>expect <<-\EOF && >>

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

2014-03-10 Thread Junio C Hamano
Duy Nguyen writes: > On Sat, Mar 8, 2014 at 1:27 AM, Junio C Hamano wrote: On the receive-pack side, the comment at the bottom of preprare_shallow_update() makes it clear that, if we wanted to use hooks, we cannot avoid having the proposed new shallow-file in a temporary file

Re: Trust issues with hooks and config files

2014-03-10 Thread Junio C Hamano
Julian Brost writes: > On 07.03.2014 22:04, Jeff King wrote: >> >> If you want to work on it, I think it's an interesting area. But >> any development would need to think about the transition plan for >> existing sites that will be broken. > > I can understand the problem with backward compatibi

Re: question about: Facebook makes Mercurial faster than Git

2014-03-10 Thread Michael Haggerty
On 03/10/2014 01:10 PM, Johan Herland wrote: > It should be possible to teach Git to do similar things, and IINM > there are (and have previously been) several attempts to do similar > things in Git, e.g.: > > - http://thread.gmane.org/gmane.comp.version-control.git/240339 > > - http://thread.g

Re: [RFC/WIP] Pluggable reference backends

2014-03-10 Thread Shawn Pearce
On Mon, Mar 10, 2014 at 4:00 AM, Michael Haggerty wrote: > I have started working on pluggable ref backends. In this email I > would like to share my plans and solicit feedback. Yay! JGit already has pluggable ref backends, so it is good to see this starting in git-core. FWIW the Gerrit Code R

Re: question about: Facebook makes Mercurial faster than Git

2014-03-10 Thread Karsten Blees
Am 10.03.2014 12:42, schrieb Dennis Luehring: > Am 10.03.2014 12:28, schrieb demerphq: >> I had the impression, and I would not be surprised if they had the >> impression that the git development community is relatively >> unconcerned about performance issues on larger repositories. > > so the que

Re: [PATCH 05/26] t1400: Add some more tests involving quoted arguments

2014-03-10 Thread Johan Herland
On Mon, Mar 10, 2014 at 1:46 PM, Michael Haggerty wrote: > Previously there were no good tests of C-quoted arguments. > > Signed-off-by: Michael Haggerty FWIW, the first 5 patches seem trivially correct to me. Feel free to add: Reviewed-by: Johan Herland -- Johan Herland, www.herland.net --

[PATCH 21/26] struct ref_update: Store refname as a FLEX_ARRAY.

2014-03-10 Thread Michael Haggerty
Signed-off-by: Michael Haggerty --- refs.c | 15 ++- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/refs.c b/refs.c index 5d08cdf..335d0e2 100644 --- a/refs.c +++ b/refs.c @@ -3274,11 +3274,11 @@ static int update_ref_write(const char *action, const char *refname, *

[PATCH 23/26] struct ref_update: Add a lock member

2014-03-10 Thread Michael Haggerty
Now that we manage ref_update objects internally, we can use them to hold some of the scratch space we need when actually carrying out the updates. Store the (struct ref_lock *) there. Signed-off-by: Michael Haggerty --- refs.c | 32 1 file changed, 16 insertion

Re: git merge --date --author

2014-03-10 Thread Yann Droneaud
Hi, Le vendredi 07 mars 2014 à 11:43 -0800, Junio C Hamano a écrit : > Andreas Schwab writes: > > > Yann Droneaud writes: > > > >> But I'd like to know if there's a specific reason for git merge to not > >> support --date and --author ? > > > > It's rather unusual that a merge is performed on b

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

2014-03-10 Thread Sandy Carter
Is there any update on this patch? Le 2014-03-03 09:55, Sandy Carter a écrit : Separate message from command examples to avoid translation issues such as a dash being omitted in a translation. Signed-off-by: Sandy Carter --- builtin/branch.c | 10 ++ 1 file changed, 6 insertions(+),

[PATCH 16/26] update-ref --stdin: Harmonize error messages

2014-03-10 Thread Michael Haggerty
Make (most of) the error messages for invalid input have the same format [1]: $COMMAND [SP $REFNAME]: $MESSAGE Update the tests accordingly. [1] A few error messages still have their old form, because $COMMAND and $REFNAME aren't passed all the way down the call stack. Signed-off-by: Michae

[PATCH 25/26] commit_ref_transaction(): Also free the ref_transaction

2014-03-10 Thread Michael Haggerty
Change commit_ref_transaction() to also free the associated data, to absolve the caller from having to do it. Signed-off-by: Michael Haggerty --- builtin/update-ref.c | 1 - refs.c | 1 + refs.h | 11 ++- 3 files changed, 7 insertions(+), 6 deletions(-) dif

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

2014-03-10 Thread Michael Haggerty
This test is trying to test a few ways to delete references using "git update-ref -z --stdin". The third line passed in is update SP /refs/heads/c NUL NUL NUL , which is not a correct way to delete a reference according to the documentation (the new value should be zeros, not empty). Pass

[PATCH 22/26] commit_ref_transaction(): Introduce temporary variables

2014-03-10 Thread Michael Haggerty
Use temporary variables in the for-loop blocks to simplify expressions in the rest of the loop. Signed-off-by: Michael Haggerty --- refs.c | 25 - 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/refs.c b/refs.c index 335d0e2..ec638e9 100644 --- a/refs.c +++

[PATCH 26/26] commit_ref_transaction(): Work with transaction->updates in place

2014-03-10 Thread Michael Haggerty
Now that we free the transaction when we are done, there is no need to make a copy of transaction->updates before working with it. Signed-off-by: Michael Haggerty --- refs.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/refs.c b/refs.c index d83fc7b..ea33adc 100644 ---

[PATCH 05/26] t1400: Add some more tests involving quoted arguments

2014-03-10 Thread Michael Haggerty
Previously there were no good tests of C-quoted arguments. Signed-off-by: Michael Haggerty --- t/t1400-update-ref.sh | 26 +- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index 5836842..627aaaf 100755 --- a/t/

[PATCH 10/26] update-ref.c: Extract a new function, parse_refname()

2014-03-10 Thread Michael Haggerty
There is no reason to obscure the fact that parse_first_arg() always parses refnames. Form the new function by combining parse_first_arg() and update_store_ref_name(). Signed-off-by: Michael Haggerty --- builtin/update-ref.c | 90 1 file chan

[PATCH 07/26] update_refs(): Fix constness

2014-03-10 Thread Michael Haggerty
Since full const correctness is beyond the ability of C's type system, just put the const where it doesn't do any harm. A (struct ref_update **) can be passed to a (struct ref_update * const *) argument, but not to a (const struct ref_update **) argument. Signed-off-by: Michael Haggerty --- bui

[PATCH 20/26] struct ref_update: Rename field "ref_name" to "refname"

2014-03-10 Thread Michael Haggerty
This is consistent with the usual nomenclature. Signed-off-by: Michael Haggerty --- refs.c | 18 +- refs.h | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/refs.c b/refs.c index 91af0a0..5d08cdf 100644 --- a/refs.c +++ b/refs.c @@ -3274,7 +3274,7 @@ stati

[PATCH 09/26] parse_cmd_verify(): Copy old_sha1 instead of evaluating twice

2014-03-10 Thread Michael Haggerty
Aside from avoiding work, this makes it transparently obvious that old_sha1 and new_sha1 are identical. Signed-off-by: Michael Haggerty --- builtin/update-ref.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/update-ref.c b/builtin/update-ref.c index 5f197fe..51adf2d

[PATCH 24/26] struct ref_update: Add type field

2014-03-10 Thread Michael Haggerty
This is temporary space for commit_ref_transaction() Signed-off-by: Michael Haggerty --- refs.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/refs.c b/refs.c index 73aec88..1fd38b0 100644 --- a/refs.c +++ b/refs.c @@ -3279,6 +3279,7 @@ struct ref_update { in

[PATCH 12/26] update-ref --stdin: Make error messages more consistent

2014-03-10 Thread Michael Haggerty
The old error messages emitted for invalid input sometimes said ""/"" and sometimes said "old value"/"new value". Convert them all to the former. Update the tests accordingly. Signed-off-by: Michael Haggerty --- builtin/update-ref.c | 8 t/t1400-update-ref.sh | 14 +++--- 2 f

  1   2   >