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

2013-09-01 Thread Junio C Hamano
Brad King brad.k...@kitware.com writes: 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. Signed-off-by: Brad King

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

2013-09-01 Thread Junio C Hamano
Brad King brad.k...@kitware.com writes: 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

[PATCH 2/2] fast-export: refactor get_tags_and_duplicates()

2013-09-01 Thread Felipe Contreras
Split into a separate helper function get_commit() so that the part that finds the relevant commit, and the part that does something with it (handle tag object, etc.) are in different places. No functional changes. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com ---

[PATCH 0/2] fast-export: simplification

2013-09-01 Thread Felipe Contreras
Hi, No functional changes, but get_tags_and_duplicates() is quite complex as it is, and can be simplified by spliting code into a separate function. Felipe Contreras (2): fast-export: make extra_refs global fast-export: refactor get_tags_and_duplicates() builtin/fast-export.c | 87

[PATCH 1/2] fast-export: make extra_refs global

2013-09-01 Thread Felipe Contreras
There's no need to pass it around everywhere. This would make easier further refactoring that makes use of this variable. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/fast-export.c | 21 ++--- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git

Re: [PATCH v3 08/11] t6050-replace: check that -f option bypasses the type check

2013-09-01 Thread Eric Sunshine
On Sat, Aug 31, 2013 at 3:12 PM, Christian Couder chrisc...@tuxfamily.org wrote: Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- t/t6050-replace.sh | 6 ++ 1 file changed, 6 insertions(+) diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index 05be228..0b07a0b 100755

Re: [PATCH v3 11/11] t6050-replace: use some long option names

2013-09-01 Thread Eric Sunshine
On Sat, Aug 31, 2013 at 3:12 PM, Christian Couder chrisc...@tuxfamily.org wrote: So that they are tested a litlle bit too. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- t/t6050-replace.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git

[PATCH 4/6] t: branch add publish branch tests

2013-09-01 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t3200-branch.sh | 76 +++ 1 file changed, 76 insertions(+) diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 44ec6a4..cd0b8e9 100755 --- a/t/t3200-branch.sh +++

[PATCH 6/6] branch: display publish branch

2013-09-01 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/branch.c | 45 - 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index 48af999..47644ad 100644 --- a/builtin/branch.c +++

[PATCH 1/6] push: trivial reorganization

2013-09-01 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/push.c | 35 +++ 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index 04f0eaf..5dc06a3 100644 --- a/builtin/push.c +++ b/builtin/push.c @@

[PATCH 5/6] push: add --set-publish option

2013-09-01 Thread Felipe Contreras
To setup publish tracking branch, like 'git branch --set-publish'. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-push.txt | 9 +- builtin/push.c | 2 ++ t/t5529-push-publish.sh| 70 ++

[PATCH 0/6] Introduce publish tracking branch

2013-09-01 Thread Felipe Contreras
Hi, As it has been discussed before, our support for triangular workflows is lacking, and the following patch series aims to improve that situation. We have the concept of upstream branch (e.g. 'origin/master') which is to where our topic branches eventually should be merged to, so it makes

[PATCH 2/6] Add concept of 'publish' branch

2013-09-01 Thread Felipe Contreras
The upstream branch is: branch.$name.remote branch.$name.merge The publish branch is: branch.$name.pushremote branch.$name.push Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/push.c | 19 +++ remote.c | 34

[PATCH 3/6] branch: allow configuring the publish branch

2013-09-01 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-branch.txt | 11 + branch.c | 43 ++ branch.h | 2 ++ builtin/branch.c | 56 4

Re: [PATCH 2/6] Add concept of 'publish' branch

2013-09-01 Thread Eric Sunshine
On Sun, Sep 1, 2013 at 4:26 AM, Felipe Contreras felipe.contre...@gmail.com wrote: The upstream branch is: branch.$name.remote branch.$name.merge The publish branch is: branch.$name.pushremote branch.$name.push Signed-off-by: Felipe Contreras felipe.contre...@gmail.com ---

Re: [PATCH v3 11/11] t6050-replace: use some long option names

2013-09-01 Thread Christian Couder
From: Eric Sunshine sunsh...@sunshineco.com diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index 0b07a0b..5dc26e8 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@ -122,9 +122,9 @@ test_expect_success 'git replace listing and deleting' ' test $HASH2 = $(git replace

Re: [PATCH v3 08/11] t6050-replace: check that -f option bypasses the type check

2013-09-01 Thread Christian Couder
From: Eric Sunshine sunsh...@sunshineco.com On Sat, Aug 31, 2013 at 3:12 PM, Christian Couder chrisc...@tuxfamily.org wrote: Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- t/t6050-replace.sh | 6 ++ 1 file changed, 6 insertions(+) diff --git a/t/t6050-replace.sh

Re: [PATCH v3 11/11] t6050-replace: use some long option names

2013-09-01 Thread Christian Couder
From: Philip Oakley philipoak...@iee.org So that they are tested a litlle bit too. s /litlle/little/ Thanks, Christian. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at

Re: [PATCH v3 05/11] Documentation/replace: add Creating Replacement Objects section

2013-09-01 Thread Christian Couder
From: Philip Oakley philipoak...@iee.org From: Christian Couder chrisc...@tuxfamily.org +CREATING REPLACEMENT OBJECTS + + +linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and +linkgit:git-rebase[1], Let's not forget the obvious 'git commit' or 'git

Re: [PATCH 2/6] Add concept of 'publish' branch

2013-09-01 Thread Felipe Contreras
On Sun, Sep 1, 2013 at 3:41 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Sun, Sep 1, 2013 at 4:26 AM, Felipe Contreras felipe.contre...@gmail.com wrote: +static void setup_push_simple(struct remote *remote, struct branch *branch, + int triangular) +{ +

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

2013-09-01 Thread Christian Couder
From: Philip Oakley philipoak...@iee.org From: Christian Couder chrisc...@tuxfamily.org The replaced object and the replacement object must be of the same type. -There is no other restriction on them. +This restriction can be bypassed using `-f`. Unless `-f` is given, the 'replace'

Re: [PATCH v3 01/11] replace: forbid replacing an object with one of a different type

2013-09-01 Thread Christian Couder
From: Philip Oakley philipoak...@iee.org Sorry for not replying earlier in the series. From: Christian Couder chrisc...@tuxfamily.org Users replacing an object with one of a different type were not prevented to do so, even if it was obvious, and stated in the doc, that bad things would

[RFC] Running a hook on reset

2013-09-01 Thread Andres Freund
Hi, I propose adding a hook that is run after git reset. My personal use case for that is that I am indexing my checkouts using global (a tool similar to ctags, cscope, ...) and I really like that index to be up2date all the time. I can catch most cases where the work tree changes from git via

Re: [PATCH v3 3/4] get rid of git submodule summary --for-status

2013-09-01 Thread Jens Lehmann
Am 31.08.2013 19:08, schrieb brian m. carlson: On Fri, Aug 30, 2013 at 10:08:53PM +0200, Jens Lehmann wrote: Am 30.08.2013 21:51, schrieb Jens Lehmann: Am 30.08.2013 21:40, schrieb Jens Lehmann: Am 29.08.2013 23:23, schrieb Matthieu Moy: Jens Lehmann jens.lehm...@web.de writes: Am

RE: THANK YOU

2013-09-01 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

Re: [PATCH v3 01/11] replace: forbid replacing an object with one of a different type

2013-09-01 Thread Philip Oakley
From: Christian Couder chrisc...@tuxfamily.org From: Philip Oakley philipoak...@iee.org Sorry for not replying earlier in the series. From: Christian Couder chrisc...@tuxfamily.org Users replacing an object with one of a different type were not prevented to do so, even if it was obvious, and

[PATCH v3 0/2] submodule: Don't print status output with submodule.name.ignore=all

2013-09-01 Thread brian m. carlson
There are configuration options for each submodule that specify under what circumstances git status should display output for that submodule. Unfortunately, these settings were not being respected, and as such the tests were marked TODO. This patch series consists of two patches: the first is a

[PATCH v3 1/2] submodule: fix confusing variable name

2013-09-01 Thread brian m. carlson
cmd_summary reads the output of git diff, but reads in the submodule path into a variable called name. Since this variable does not contain the name of the submodule, but the path, rename it to be clearer what data it actually holds. Signed-off-by: brian m. carlson sand...@crustytoothpaste.net

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

2013-09-01 Thread brian m. carlson
git status prints information for submodules, but it should ignore the status of those which have submodule.name.ignore set to all. Fix it so that it does properly ignore those which have that setting either in .git/config or in .gitmodules. Not ignored are submodules that are added, deleted, or

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

2013-09-01 Thread Philip Oakley
From: Christian Couder chrisc...@tuxfamily.org From: Philip Oakley philipoak...@iee.org From: Christian Couder chrisc...@tuxfamily.org The replaced object and the replacement object must be of the same type. -There is no other restriction on them. +This restriction can be bypassed using

RE: THANK YOU

2013-09-01 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] {fetch,receive}-pack: drop unpack-objects, delay loosing objects until the end

2013-09-01 Thread Nguyễn Thái Ngọc Duy
Current code peaks into the transfered pack's header, if the number of objects is under a limit, unpack-objects is called to handle the rest, otherwise index-pack is. This patch makes fetch-pack use index-pack unconditionally, then turn objects loose and remove the pack at the end. unpack-objects

Re: [PATCH] {fetch,receive}-pack: drop unpack-objects, delay loosing objects until the end

2013-09-01 Thread Eric Sunshine
On Sun, Sep 1, 2013 at 11:05 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: Current code peaks into the transfered pack's header, if the number of s/peaks/peeks/ objects is under a limit, unpack-objects is called to handle the rest, otherwise index-pack is. This patch makes fetch-pack use

[PATCH v2] peel_onion(): add support for rev^{tag}

2013-09-01 Thread Richard Hansen
Complete the rev^{type} family of object specifiers by having rev^{tag} dereference rev until a tag object is found (or fail if unable). At first glance this may not seem very useful, as commits, trees, and blobs cannot be peeled to a tag, and a tag would just peel to itself. However, this can be

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

2013-09-01 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..b1993e0 100644 --- a/Documentation/glossary-content.txt

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

2013-09-01 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 v2 7/7] glossary: fix and clarify the definition of 'ref'

2013-09-01 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 a2edcc3..44d524b 100644 ---