Re: Officially start moving to the term 'staging area'

2013-09-04 Thread William Swanson
On Thu, Aug 29, 2013 at 11:01 AM, Felipe Contreras felipe.contre...@gmail.com wrote: It has been discussed many times in the past that 'index' is not an appropriate description for what the high-level user does with it, and it has been agreed that 'staging area' is the best term. I realize Git

[Bug?] MERGE_HEAD lost with git checkout master

2013-09-04 Thread Chris Packham
Hi, At $dayjob we have some simple code quality checks that we run to make sure that things are heading in the right direction. These are usually run as part of our automated builds but people occasionally run them when merging updates from other teams or preparing to merge to the integration

German translation errors

2013-09-04 Thread Dirk Heinrichs
Hi, when I fetch from remote repositories, git tells me about new branches and tags by saying [neuer Branch] or [neuer Tag]. While Branch translates to Zweig in german, the german word Tag actually means day, so git is telling me something about a new day for every new tag. Should be neue

Re: [PATCH v3 2/2] submodule: don't print status output with ignore=all

2013-09-04 Thread Matthieu Moy
brian m. carlson sand...@crustytoothpaste.net writes: Tests are included which verify that this change has no effect on git submodule summary without the --for-status option. I still don't understand why this is needed. Why do we want git status and git submodule summary to display different

Re: [PATCH v3] Teach git to change to a given directory using -C option

2013-09-04 Thread Nazri Ramliy
On Wed, Sep 4, 2013 at 6:46 AM, Junio C Hamano gits...@pobox.com wrote: I do not care too deeply either way, but I am curious if there was a reason why you changed the earlier directory to path? Somehow, when we _know_ a path has to be a directory, I find it easier on the readers to spell

Re: [PATCH v3] Teach git to change to a given directory using -C option

2013-09-04 Thread Eric Sunshine
On Wed, Sep 4, 2013 at 2:36 AM, Nazri Ramliy ayieh...@gmail.com wrote: On Wed, Sep 4, 2013 at 6:46 AM, Junio C Hamano gits...@pobox.com wrote: I do not care too deeply either way, but I am curious if there was a reason why you changed the earlier directory to path? Somehow, when we _know_ a

Re: Officially start moving to the term 'staging area'

2013-09-04 Thread Piotr Krukowiecki
Just wanted to point to a Dr. Dobb's article from Monday: http://www.drdobbs.com/tools/getting-started-with-git-the-fundamental/240160261?pgno=2 The author does not use the use the word index at all. Instead he writes in following way:

[PATCH] add--interactive: fix external command invocation on Windows

2013-09-04 Thread Johannes Sixt
From: Johannes Sixt j...@kdbg.org Back in 21e9757e (Hack git-add--interactive to make it work with ActiveState Perl, 2007-08-01), the invocation of external commands was changed to use qx{} on Windows. The rationale was that the command interpreter on Windows is not a POSIX shell, but rather

Transfer notes when rebasing

2013-09-04 Thread Francis Moreau
Hello, When rebasing a branch which contains commits with notes onto another branch it happens that some commits are already presents in the target branch. In that case git-rebase correctly drops those (already present) commits but it also drops the notes associated with them. Can the notes be

Re: Transfer notes when rebasing

2013-09-04 Thread John Keeping
On Wed, Sep 04, 2013 at 03:53:10AM -0400, Jeff King wrote: On Wed, Sep 04, 2013 at 09:51:26AM +0200, Francis Moreau wrote: When rebasing a branch which contains commits with notes onto another branch it happens that some commits are already presents in the target branch. In that case

Re: Transfer notes when rebasing

2013-09-04 Thread Francis Moreau
On Wed, Sep 4, 2013 at 9:59 AM, John Keeping j...@keeping.me.uk wrote: On Wed, Sep 04, 2013 at 03:53:10AM -0400, Jeff King wrote: On Wed, Sep 04, 2013 at 09:51:26AM +0200, Francis Moreau wrote: When rebasing a branch which contains commits with notes onto another branch it happens that some

Re: [PATCH] git send-email: include [anything]-by: signatures

2013-09-04 Thread Michael S. Tsirkin
On Tue, Sep 03, 2013 at 02:39:05PM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: On Wed, Sep 04, 2013 at 12:01:49AM +0300, Michael S. Tsirkin wrote: The question of course is the first point Peff raised. I am not sure offhand what the right per-project customization

Re: Bug in git rebase --continue in v1.8.4

2013-09-04 Thread Andriy Gapon
Christoph Mallon said: if I run rebase --continue (e.g. after a conflict resolution), then the rebase always ends with this error message: It seems that there is already a rebase-apply directory, and I wonder if you are in the middle of another rebase. If that is the case,

Re: [PATCH 0/3] Reject non-ff pulls by default

2013-09-04 Thread John Keeping
On Tue, Sep 03, 2013 at 03:38:58PM -0700, Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: On Tue, Sep 3, 2013 at 12:21 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Junio already sent a similar patch, but I

Re: Bug in git rebase --continue in v1.8.4

2013-09-04 Thread Matthieu Moy
[ Cc-ing Ram, as he is the author of the possibly guilty commit. ] Andriy Gapon a...@freebsd.org writes: Christoph Mallon said: if I run rebase --continue (e.g. after a conflict resolution), then the rebase always ends with this error message: It seems that there is already a

Re: Transfer notes when rebasing

2013-09-04 Thread Jeff King
On Wed, Sep 04, 2013 at 08:59:41AM +0100, John Keeping wrote: On Wed, Sep 04, 2013 at 03:53:10AM -0400, Jeff King wrote: On Wed, Sep 04, 2013 at 09:51:26AM +0200, Francis Moreau wrote: When rebasing a branch which contains commits with notes onto another branch it happens that some

Re: Transfer notes when rebasing

2013-09-04 Thread Francis Moreau
On Wed, Sep 4, 2013 at 10:28 AM, Jeff King p...@peff.net wrote: On Wed, Sep 04, 2013 at 08:59:41AM +0100, John Keeping wrote: On Wed, Sep 04, 2013 at 03:53:10AM -0400, Jeff King wrote: On Wed, Sep 04, 2013 at 09:51:26AM +0200, Francis Moreau wrote: When rebasing a branch which contains

Re: Transfer notes when rebasing

2013-09-04 Thread Jeff King
On Wed, Sep 04, 2013 at 10:47:22AM +0200, Francis Moreau wrote: However, if the commit is dropped because we find while applying that it becomes empty, there is not much we can do. It may have been obsoleted by its counterpart patch that had a different patch-id, or it may even have been

Re: Bug in git rebase --continue in v1.8.4

2013-09-04 Thread Andriy Gapon
on 04/09/2013 11:18 Matthieu Moy said the following: [ Cc-ing Ram, as he is the author of the possibly guilty commit. ] Andriy Gapon a...@freebsd.org writes: Judging by the lack of followups, could this be a FreeBSD-specific problem? I can't reproduce here (Debian GNU/Linux). Do the

Re: What's cooking in git.git (Sep 2013, #01; Tue, 3)

2013-09-04 Thread Jeff King
On Tue, Sep 03, 2013 at 04:00:32PM -0700, Junio C Hamano wrote: * jk/duplicate-objects-in-packs (2013-08-24) 6 commits - default pack.indexDuplicates to false - index-pack: optionally reject packs with duplicate objects - test index-pack on packs with recoverable delta cycles - add tests

Re: Bug in git rebase --continue in v1.8.4

2013-09-04 Thread Andriy Gapon
This looks like bug in FreeBSD shell indeed. If a script is sourced within a function scope, then 'return' in the script causes the function to return. But it should cause the sourced script to return. I'll see what we can do about this. Sorry for distracting you. And thank you for the help!

Re: [PATCH 0/3] Reject non-ff pulls by default

2013-09-04 Thread Jeff King
On Wed, Sep 04, 2013 at 09:10:47AM +0100, John Keeping wrote: I think there are two distinct uses for pull, which boil down to: (1) git pull (2) git pull $remote $branch For (1) a merge is almost always the wrong thing to do since it will be backwards and break --first-parent.

Re: [PATCH 0/3] Reject non-ff pulls by default

2013-09-04 Thread John Keeping
On Wed, Sep 04, 2013 at 05:25:27AM -0400, Jeff King wrote: On Wed, Sep 04, 2013 at 09:10:47AM +0100, John Keeping wrote: I think there are two distinct uses for pull, which boil down to: (1) git pull (2) git pull $remote $branch For (1) a merge is almost always the wrong

My Proposal

2013-09-04 Thread Mr. Chi Pui
Good day, I Am Chi Pui;Do not be surprised! I got your email contact via the World Email On-line Directory I am crediting officer at Sino Pac Bank Plc in Hong Kong and i have a deal of $17.3M to discuss with you urgently. Regards, Mr.Chi Pui -- To unsubscribe from this list: send the line

Re: German translation errors

2013-09-04 Thread Ralf Thielow
Hi, this is not an error but intention. From Git 1.8.4, the German translation switches from pure German to German+English. For me the most important reasons for that are that terms like Branch and Tag are well-known SCM/Git terms for many German people, and using Zweig and Marke could be more

Re: What's cooking in git.git (Sep 2013, #01; Tue, 3)

2013-09-04 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: * mm/status-without-comment-char (2013-08-29) 5 commits - status: introduce status.displayCommentChar to disable display of # - SQUASH: do not fprintf() random strings - get rid of git submodule summary --for-status - wt-status: use argv_array API

Re: Bug in git rebase --continue in v1.8.4

2013-09-04 Thread Matthieu Moy
Andriy Gapon a...@freebsd.org writes: This looks like bug in FreeBSD shell indeed. Yes: the testsuite would have caught it otherwise. If a script is sourced within a function scope, then 'return' in the script causes the function to return. But it should cause the sourced script to

Re: [PATCH] add--interactive: fix external command invocation on Windows

2013-09-04 Thread Duy Nguyen
On Wed, Sep 4, 2013 at 2:24 PM, Johannes Sixt j.s...@viscovery.net wrote: From: Johannes Sixt j...@kdbg.org Back in 21e9757e (Hack git-add--interactive to make it work with ActiveState Perl, 2007-08-01), the invocation of external commands was changed to use qx{} on Windows. The rationale was

Re: [PATCH v3] Teach git to change to a given directory using -C option

2013-09-04 Thread Nazri Ramliy
On Wed, Sep 04, 2013 at 02:36:47PM +0800, Nazri Ramliy wrote: On Wed, Sep 4, 2013 at 6:46 AM, Junio C Hamano gits...@pobox.com wrote: Does the above format correctly without the usual second and subsequent paragraphs are not indented, but has '+' in place of a blank line? No it doesn't.

Re: German translation errors

2013-09-04 Thread Dirk Heinrichs
Am Mittwoch, 4. September 2013, 13:11:39 schrieben Sie: this is not an error but intention. From Git 1.8.4, the German translation switches from pure German to German+English. For me the most important reasons for that are that terms like Branch and Tag are well-known SCM/Git terms for many

Re: Officially start moving to the term 'staging area'

2013-09-04 Thread Drew Northup
On Wed, Sep 4, 2013 at 3:13 AM, Piotr Krukowiecki piotr.krukowie...@gmail.com wrote: Just wanted to point to a Dr. Dobb's article from Monday: http://www.drdobbs.com/tools/getting-started-with-git-the-fundamental/240160261?pgno=2 The author does not use the use the word index at all. Instead

[PATCH] git-gui: Modify push dialog to support Gerrit review

2013-09-04 Thread Joergen Edelbo
Problem: It is not possible to push for Gerrit review as you will always try to push to /refs/heads/... on the remote. As you should not be forced to work on a branch with the same name as some branch on the remote, some more flexibility in the selection of destination branch is also needed.

[PATCH v4 8/8] update-ref: add test cases covering --stdin signature

2013-09-04 Thread Brad King
Extend t/t1400-update-ref.sh to cover cases using the --stdin option. Signed-off-by: Brad King brad.k...@kitware.com --- t/t1400-update-ref.sh | 445 ++ 1 file changed, 445 insertions(+) diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh

[PATCH v4 5/8] refs: add function to repack without multiple refs

2013-09-04 Thread Brad King
Generalize repack_without_ref as repack_without_refs to support a list of refs and implement the former in terms of the latter. Signed-off-by: Brad King brad.k...@kitware.com --- refs.c | 33 - 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/refs.c

[PATCH v4 6/8] refs: add update_refs for multiple simultaneous updates

2013-09-04 Thread Brad King
Add 'struct ref_update' to encode the information needed to update or delete a ref (name, new sha1, optional old sha1, no-deref flag). Add function 'update_refs' accepting an array of updates to perform. First sort the input array to order locks consistently everywhere and reject multiple

[PATCH v4 3/8] refs: factor update_ref steps into helpers

2013-09-04 Thread Brad King
Factor the lock and write steps and error handling into helper functions update_ref_lock and update_ref_write to allow later use elsewhere. Expose lock_any_ref_for_update's type_p to update_ref_lock callers. While at it, drop static from the local lock variable as it is not necessary to keep

[PATCH v4 7/8] update-ref: support multiple simultaneous updates

2013-09-04 Thread Brad King
Add a --stdin signature to read update instructions from standard input and apply multiple ref updates together. Use an input format that supports any update that could be specified via the command-line, including object names like branch:path with space. Signed-off-by: Brad King

[PATCH v4 1/8] reset: rename update_refs to reset_refs

2013-09-04 Thread Brad King
The function resets refs rather than doing arbitrary updates. Rename it to allow a future general-purpose update_refs function to be added. Signed-off-by: Brad King brad.k...@kitware.com --- builtin/reset.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/reset.c

[PATCH v4 0/8] Multiple simultaneously locked ref updates

2013-09-04 Thread Brad King
Hi Folks, Here is the fourth revision of a series to support locking multiple refs at the same time to update all of them consistently. The previous revisions of the series can be found at $gmane/233260, $gmane/233458, and $gmane/233647. Updates since the previous revision of the series: *

[PATCH v4 2/8] refs: report ref type from lock_any_ref_for_update

2013-09-04 Thread Brad King
Expose lock_ref_sha1_basic's type_p argument to callers of lock_any_ref_for_update. Update all call sites to ignore it by passing NULL for now. Signed-off-by: Brad King brad.k...@kitware.com --- branch.c | 2 +- builtin/commit.c | 2 +- builtin/fetch.c| 3 ++-

[PATCH v4 4/8] refs: factor delete_ref loose ref step into a helper

2013-09-04 Thread Brad King
Factor loose ref deletion into helper function delete_ref_loose to allow later use elsewhere. Signed-off-by: Brad King brad.k...@kitware.com --- refs.c | 27 +-- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/refs.c b/refs.c index 4347826..ab9d22e 100644

Re: [PATCH 0/4] Re: [PATCH 3/4] t: rev-parse-parents: avoid yoda conditions

2013-09-04 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: test_cmp_rev follows the same order of arguments a diff -u and produces the same output as plain git diff. It's perfectly readable and normal. This is way off tangent, but I am somewhat sympathetic to Felipe's compare actual with expect, with

Re: [PATCH 0/3] Reject non-ff pulls by default

2013-09-04 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: On Tue, Sep 03, 2013 at 03:38:58PM -0700, Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: On Tue, Sep 3, 2013 at 12:21 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes:

Re: [PATCH 0/4] Re: [PATCH 3/4] t: rev-parse-parents: avoid yoda conditions

2013-09-04 Thread John Keeping
On Wed, Sep 04, 2013 at 09:47:12AM -0700, Junio C Hamano wrote: Jonathan Nieder jrnie...@gmail.com writes: test_cmp_rev follows the same order of arguments a diff -u and produces the same output as plain git diff. It's perfectly readable and normal. This is way off tangent, but I am

Re: [PATCH 4/4] t: branch: improve test rollback

2013-09-04 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: On Tue, Sep 3, 2013 at 5:59 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: On Tue, Sep 3, 2013 at 2:32 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com

Re: [PATCH 0/4] Re: [PATCH 3/4] t: rev-parse-parents: avoid yoda conditions

2013-09-04 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: On Wed, Sep 04, 2013 at 09:47:12AM -0700, Junio C Hamano wrote: Jonathan Nieder jrnie...@gmail.com writes: test_cmp_rev follows the same order of arguments a diff -u and produces the same output as plain git diff. It's perfectly readable and

Re: German translation errors

2013-09-04 Thread Ralf Thielow
On Wed, Sep 4, 2013 at 3:20 PM, Dirk Heinrichs dirk.heinri...@altum.de wrote: Am Mittwoch, 4. September 2013, 13:11:39 schrieben Sie: this is not an error but intention. From Git 1.8.4, the German translation switches from pure German to German+English. For me the most important reasons for

Re: [PATCH v4 7/8] update-ref: support multiple simultaneous updates

2013-09-04 Thread Junio C Hamano
Brad King brad.k...@kitware.com writes: +With `--stdin`, update-ref reads instructions from standard input and +performs all modifications together. Empty lines are ignored. +Each non-empty line is parsed as whitespace-separated arguments. whitespace-separated implies that we may allow

Re: [PATCH 0/4] Re: [PATCH 3/4] t: rev-parse-parents: avoid yoda conditions

2013-09-04 Thread Jeff King
On Wed, Sep 04, 2013 at 10:38:03AM -0700, Junio C Hamano wrote: This is way off tangent, but I am somewhat sympathetic to Felipe's compare actual with expect, with reservations. This isn't an argument either way, but note that JUnit (and NUnit and PHPUnit) all have assertEquals methods

[PATCH v3 7/7] glossary: fix and clarify the definition of 'ref'

2013-09-04 Thread Richard Hansen
Signed-off-by: Richard Hansen rhan...@bbn.com --- Documentation/glossary-content.txt | 18 ++ 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 3466ce9..7ad13e1 100644 ---

[PATCH v3 6/7] revisions.txt: fix and clarify rev^{type}

2013-09-04 Thread Richard Hansen
If possible, rev will be dereferenced even if it is not a tag type (e.g., commit dereferenced to a tree). Signed-off-by: Richard Hansen rhan...@bbn.com --- Documentation/revisions.txt | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Documentation/revisions.txt

[PATCH v3 0/7] documentation cleanups for rev^{type}

2013-09-04 Thread Richard Hansen
On 2013-09-03 18:46, Junio C Hamano wrote: I hate to say this after seeing you doing a thorough job in this series, but because tree-ish and commit-ish are both made-up words, I have a feeling that we are better off unifying to the dashed form, which unfortunately is the other way around from

[PATCH v3 2/7] glossary: define commit-ish (a.k.a. committish)

2013-09-04 Thread Richard Hansen
Signed-off-by: Richard Hansen rhan...@bbn.com --- Documentation/glossary-content.txt | 12 1 file changed, 12 insertions(+) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 0273095..47e901e 100644 --- a/Documentation/glossary-content.txt

[PATCH v3 1/7] glossary: mention 'treeish' as an alternative to 'tree-ish'

2013-09-04 Thread Richard Hansen
The documentation contains a mix of the two spellings, so include both in the glossary so that a search for either will lead to the definition. Signed-off-by: Richard Hansen rhan...@bbn.com --- Documentation/glossary-content.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[PATCH v3 5/7] glossary: more precise definition of tree-ish (a.k.a. treeish)

2013-09-04 Thread Richard Hansen
A tree-ish isn't a ref. Also, mention dereferencing, and that a commit dereferences to a tree, to support gitrevisions(7) and rev-parse's error messages. Signed-off-by: Richard Hansen rhan...@bbn.com --- Documentation/glossary-content.txt | 15 --- 1 file changed, 12 insertions(+),

[PATCH v3 4/7] use 'commit-ish' instead of 'committish'

2013-09-04 Thread Richard Hansen
Replace 'committish' in documentation and comments with 'commit-ish' to match gitglossary(7) and to be consistent with 'tree-ish'. The only remaining instances of 'committish' are: * variable, function, and macro names * (also committish) in the definition of commit-ish in gitglossary[7]

[PATCH v3 3/7] use 'tree-ish' instead of 'treeish'

2013-09-04 Thread Richard Hansen
Replace 'treeish' in documentation and comments with 'tree-ish' to match gitglossary(7). The only remaining instances of 'treeish' are: * variable, function, and macro names * (also treeish) in the definition of tree-ish in gitglossary(7) Signed-off-by: Richard Hansen rhan...@bbn.com ---

Re: [PATCH 0/4] Re: [PATCH 3/4] t: rev-parse-parents: avoid yoda conditions

2013-09-04 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Wed, Sep 04, 2013 at 10:38:03AM -0700, Junio C Hamano wrote: This is way off tangent, but I am somewhat sympathetic to Felipe's compare actual with expect, with reservations. This isn't an argument either way, but note that JUnit (and NUnit and

Re: [PATCH v4 7/8] update-ref: support multiple simultaneous updates

2013-09-04 Thread Junio C Hamano
Brad King brad.k...@kitware.com writes: +static void update_refs_stdin_read_n() +{ + struct strbuf line = STRBUF_INIT; + + while (strbuf_getline(line, stdin, '\n') != EOF) + update_refs_stdin_parse_line(line.buf); + + strbuf_release(line); +} + +static void

Re: [PATCH v4 7/8] update-ref: support multiple simultaneous updates

2013-09-04 Thread Brad King
On 09/04/2013 03:17 PM, Junio C Hamano wrote: Brad King brad.k...@kitware.com writes: +static void update_refs_stdin_read_n() +static void update_refs_stdin_read_z() These need to be defined with explicit (void) argument list. Oops, fixed. Thanks, -Brad -- To unsubscribe from this list:

Re: What's cooking in git.git (Sep 2013, #01; Tue, 3)

2013-09-04 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Junio C Hamano gits...@pobox.com writes: * mm/status-without-comment-char (2013-08-29) 5 commits - status: introduce status.displayCommentChar to disable display of # - SQUASH: do not fprintf() random strings - get rid of git submodule

Re: [PATCH v3 2/2] submodule: don't print status output with ignore=all

2013-09-04 Thread Jens Lehmann
Am 03.09.2013 21:53, schrieb Junio C Hamano: Jens, I see 1/2 is the same as the previous one you already acked. Yep. Does this update to 2/2 look good to you? Sorry, but I lost track of the discussion that led to this reroll, hence a ping. v3 fixes the bug Matthieu noticed, I only had some

Re: [PATCH v4 7/8] update-ref: support multiple simultaneous updates

2013-09-04 Thread Brad King
On 09/04/2013 02:23 PM, Junio C Hamano wrote: whitespace-separated implies that we may allow fields separated with not a single SP, but with double SPs or even HTs between them. I personally do not think we should be so loose Okay, I will look at making it more strict. See proposed format

Re: [PATCH v4 03/11] t6050-replace: test that objects are of the same type

2013-09-04 Thread Junio C Hamano
Christian Couder chrisc...@tuxfamily.org writes: Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- t/t6050-replace.sh | 13 + 1 file changed, 13 insertions(+) diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index decdc33..5c352c4 100755 --- a/t/t6050-replace.sh

Re: [PATCH v3 2/2] submodule: don't print status output with ignore=all

2013-09-04 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de writes: Am 03.09.2013 21:53, schrieb Junio C Hamano: Jens, I see 1/2 is the same as the previous one you already acked. Yep. Does this update to 2/2 look good to you? Sorry, but I lost track of the discussion that led to this reroll, hence a ping. v3

Re: [PATCH v4 07/11] Documentation/replace: tell that -f option bypasses the type check

2013-09-04 Thread Junio C Hamano
Christian Couder chrisc...@tuxfamily.org writes: Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- Documentation/git-replace.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt index

Re: What's cooking in git.git (Sep 2013, #01; Tue, 3)

2013-09-04 Thread Jens Lehmann
Am 04.09.2013 21:19, schrieb Junio C Hamano: Matthieu Moy matthieu@grenoble-inp.fr writes: Junio C Hamano gits...@pobox.com writes: * mm/status-without-comment-char (2013-08-29) 5 commits - status: introduce status.displayCommentChar to disable display of # - SQUASH: do not fprintf()

Re: [PATCH v4 06/11] replace: bypass the type check if -f option is used

2013-09-04 Thread Junio C Hamano
Christian Couder chrisc...@tuxfamily.org writes: If -f option, which means '--force', is used, we can allow an object to be replaced with one of a different type, as the user should know what (s)he is doing. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- This does not matter

Re: [PATCH v3 2/2] submodule: don't print status output with ignore=all

2013-09-04 Thread Jens Lehmann
Am 04.09.2013 08:31, schrieb Matthieu Moy: brian m. carlson sand...@crustytoothpaste.net writes: Tests are included which verify that this change has no effect on git submodule summary without the --for-status option. I still don't understand why this is needed. To avoid a change in

Re: [PATCH v4 10/11] Documentation/replace: list long option names

2013-09-04 Thread Junio C Hamano
Christian Couder chrisc...@tuxfamily.org writes: Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- Documentation/git-replace.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt index a2bd2ee..414000e 100644 ---

Re: [PATCH v4 07/11] Documentation/replace: tell that -f option bypasses the type check

2013-09-04 Thread Junio C Hamano
Christian Couder chrisc...@tuxfamily.org writes: Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- Documentation/git-replace.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt index

Re: [PATCH v3 2/2] submodule: don't print status output with ignore=all

2013-09-04 Thread Jens Lehmann
Am 04.09.2013 22:57, schrieb Junio C Hamano: Jens Lehmann jens.lehm...@web.de writes: Am 03.09.2013 21:53, schrieb Junio C Hamano: Does this update to 2/2 look good to you? Sorry, but I lost track of the discussion that led to this reroll, hence a ping. v3 fixes the bug Matthieu noticed,

Re: [PATCH v4 7/8] update-ref: support multiple simultaneous updates

2013-09-04 Thread Junio C Hamano
Brad King brad.k...@kitware.com writes: Nothing else uses LF NUL. I chose it as a starting point for this very discussion, which I asked about in $gmane/233653. The primary reason why LF raised my eyebrow was because the reason why many subcommands use -z (and NUL) is often because the

Re: [PATCH 0/3] Reject non-ff pulls by default

2013-09-04 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com John Keeping j...@keeping.me.uk writes: I think there are two distinct uses for pull, which boil down to: (1) git pull (2) git pull $remote $branch For (1) a merge is almost always the wrong thing to do since it will be backwards and break

Re: [PATCH v3 0/7] documentation cleanups for rev^{type}

2013-09-04 Thread Junio C Hamano
Richard Hansen rhan...@bbn.com writes: On 2013-09-03 18:46, Junio C Hamano wrote: I hate to say this after seeing you doing a thorough job in this series, but because tree-ish and commit-ish are both made-up words, I have a feeling that we are better off unifying to the dashed form, which

typofix: commit is spelled with two ems

2013-09-04 Thread Junio C Hamano
There are a handful of instances where we say commmit when we mean commit. Fix them. Signed-off-by: Junio C Hamano gits...@pobox.com --- notes-utils.h | 2 +- t/t3509-cherry-pick-merge-df.sh | 2 +- t/t6022-merge-rename.sh | 14 +++--- 3 files changed, 9

Re: Get back to me

2013-09-04 Thread mslizawong
i have a business proposal for you, write me back for more info. -Sent from my ipad. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH 3/3] add--interactive: fix external command invocation on Windows

2013-09-04 Thread Nguyễn Thái Ngọc Duy
From: Johannes Sixt j...@kdbg.org Back in 21e9757e (Hack git-add--interactive to make it work with ActiveState Perl, 2007-08-01), the invocation of external commands was changed to use qx{} on Windows. The rationale was that the command interpreter on Windows is not a POSIX shell, but rather

[PATCH 1/3] pathspec: catch prepending :(prefix) on pathspec with short magic

2013-09-04 Thread Nguyễn Thái Ngọc Duy
:(prefix) is in the long form. Suppose people pass :!foo with '!' being the short form of magic 'bar', the code will happily turn it to :(prefix..)!foo, which makes '!' part of the path and no longer a magic. The correct form must be ':(prefix..,bar)foo', but as so far we haven't had any magic in

[PATCH 2/3] add: lift the pathspec magic restriction on add -p

2013-09-04 Thread Nguyễn Thái Ngọc Duy
Since 480ca64 (convert run_add_interactive to use struct pathspec - 2013-07-14), we have unconditionally passed :(prefix)xxx to add-interactive.perl. It implies that all commands add-interactive.perl calls must be aware of pathspec magic, or :(prefix) is barfed. The restriction to :/ only becomes

Re: [PATCH 09/23] pack v4: commit object encoding

2013-09-04 Thread Nicolas Pitre
On Tue, 3 Sep 2013, Duy Nguyen wrote: On Tue, Sep 3, 2013 at 1:30 PM, Nicolas Pitre n...@fluxnic.net wrote: On Tue, 3 Sep 2013, Duy Nguyen wrote: On Tue, Aug 27, 2013 at 11:25 AM, Nicolas Pitre n...@fluxnic.net wrote: This goes as follows: - Tree reference: either variable length

Re: [PATCH v2] Document pack v4 format

2013-09-04 Thread Nicolas Pitre
On Tue, 3 Sep 2013, Duy Nguyen wrote: On Tue, Sep 3, 2013 at 6:49 PM, Duy Nguyen pclo...@gmail.com wrote: On Tue, Sep 3, 2013 at 1:46 PM, Nicolas Pitre n...@fluxnic.net wrote: So... looks like pack v4 is now functional. However something is still wrong as it operates about 6 times slower

Re: [PATCH v2] Document pack v4 format

2013-09-04 Thread Duy Nguyen
On Thu, Sep 5, 2013 at 11:12 AM, Nicolas Pitre n...@fluxnic.net wrote: Many other bugs have now been fixed. A git.git repository with packs version 4 appears to be functional and passes git-fsck --full --strict. Yeah I was looking at the diff some minutes ago, saw changes in pack-check.c and

Re: [PATCH v2] Document pack v4 format

2013-09-04 Thread Nicolas Pitre
On Thu, 5 Sep 2013, Duy Nguyen wrote: On Thu, Sep 5, 2013 at 11:12 AM, Nicolas Pitre n...@fluxnic.net wrote: Many other bugs have now been fixed. A git.git repository with packs version 4 appears to be functional and passes git-fsck --full --strict. Yeah I was looking at the diff some

Re: [PATCH v2] Document pack v4 format

2013-09-04 Thread Duy Nguyen
On Thu, Sep 5, 2013 at 11:40 AM, Nicolas Pitre n...@fluxnic.net wrote: On Thu, 5 Sep 2013, Duy Nguyen wrote: On Thu, Sep 5, 2013 at 11:12 AM, Nicolas Pitre n...@fluxnic.net wrote: Many other bugs have now been fixed. A git.git repository with packs version 4 appears to be functional and