[PATCH v2] git-svn: Fix termination issues for remote svn connections

2013-09-09 Thread Uli Heller
From a763550fc59b756580f9b162839d2737c27f2fe3 Mon Sep 17 00:00:00 2001 From: Uli Heller uli.hel...@daemons-point.com Date: Tue, 3 Sep 2013 09:14:03 +0200 Subject: [PATCH] git-svn: Fix termination issues for remote svn connections When using git-svn in combination with serf-1.2.1 core dumps are

Re: [PATCH 1/2] version-gen: cleanup

2013-09-09 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: No functional changes. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- GIT-VERSION-GEN | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index

Re: [PATCH 2/2] version-gen: avoid messing the version

2013-09-09 Thread Felipe Contreras
On Mon, Sep 9, 2013 at 12:51 AM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: If the version is 'v1.8.4-rc1' that is the version, and there's no need to change it to anything else, like 'v1.8.4.rc1'. Signed-off-by: Felipe Contreras

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

2013-09-09 Thread Matthieu Moy
Felipe Contreras felipe.contre...@gmail.com writes: On Sun, Sep 8, 2013 at 7:01 PM, brian m. carlson sand...@crustytoothpaste.net wrote: Yes, that would be me. My hesitance here is that as the one usually driving git updates (which so far have happened once a year), I will end up

[PATCH] rebase: fix run_specific_rebase's use of return on FreeBSD

2013-09-09 Thread Matthieu Moy
Since a1549e10, git-rebase--am.sh uses the shell's return statement, to mean return from the current file inclusion, which is POSIXly correct, but badly interpreted on FreeBSD, which returns from the current function, hence skips the finish_rebase statement that follows the file inclusion. Make

Re: [PATCH] rebase: fix run_specific_rebase's use of return on FreeBSD

2013-09-09 Thread Ramkumar Ramachandra
Matthieu Moy wrote: diff --git a/git-rebase.sh b/git-rebase.sh index 8d7659a..226752f 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -167,13 +167,22 @@ You can run git stash pop or git stash drop at any time. rm -rf $state_dir } -run_specific_rebase () {

Janier

2013-09-09 Thread Leonard Rose
Sent from my iPhone -- 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

HELLO

2013-09-09 Thread Notification Dept
Dear Beneficiary, You have won £1,000.000 great british pounds in the ongoing promo draw. For claims, contact Mr Jeremy via email on: enquiry.d...@qq.com Thanks, Notification Department. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH 08/11] pack-objects: create pack v4 tables

2013-09-09 Thread Duy Nguyen
On Sun, Sep 8, 2013 at 10:04 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: +static void prepare_sha1_table(void) +{ + unsigned i; + /* +* This table includes SHA-1s that may not be present in the +* pack. One of the use of such SHA-1 is for completing thin +

Re: [PATCH 08/11] pack-objects: create pack v4 tables

2013-09-09 Thread Nicolas Pitre
On Mon, 9 Sep 2013, Duy Nguyen wrote: On Sun, Sep 8, 2013 at 10:04 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: +static void prepare_sha1_table(void) +{ + unsigned i; + /* +* This table includes SHA-1s that may not be present in the +* pack. One of

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

2013-09-09 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 | 639 ++ 1 file changed, 639 insertions(+) diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh

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

2013-09-09 Thread Brad King
Hi Folks, Here is the fifth 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, $gmane/233647, and $gmane/233840. Updates since the previous revision of the

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

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

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

2013-09-09 Thread Nazri Ramliy
On Mon, Sep 09, 2013 at 01:01:33AM -0400, Eric Sunshine wrote: On Sun, Sep 8, 2013 at 9:49 PM, Nazri Ramliy ayieh...@gmail.com wrote: Thanks for the reference. I did read that thread earlier. It doesn't really answer my question, but perhaps it's not terribly important since the interaction is

[PATCH v2 00/16] pack v4 support in pack-objects

2013-09-09 Thread Nguyễn Thái Ngọc Duy
This version supports thin pack. I could clone from git.git with only master, then fetch the rest and fsck did not complain anything. I did not check if I broke --max-pack-size though. Interesting patches are the ones near the end: prepare SHA-1 table, support writing pack v4 and support

[PATCH v2 02/16] pack v4: stop using static/global variables in packv4-create.c

2013-09-09 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- packv4-create.c | 103 -- packv4-create.h (new) | 11 ++ 2 files changed, 69 insertions(+), 45 deletions(-) create mode 100644 packv4-create.h diff --git a/packv4-create.c

[PATCH v2 03/16] pack v4: move packv4-create.c to libgit.a

2013-09-09 Thread Nguyễn Thái Ngọc Duy
git-packv4-create now becomes test-packv4. Code that will not be used by pack-objects.c is moved to test-packv4.c. It may be removed when the code transition to pack-objects completes. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- Makefile| 4 +- packv4-create.c |

[PATCH v2 05/16] pack_write: tighten valid object type check in encode_in_pack_object_header

2013-09-09 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- pack-write.c | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pack-write.c b/pack-write.c index 88e4788..36b88a3 100644 --- a/pack-write.c +++ b/pack-write.c @@ -325,8 +325,17 @@ int

[PATCH v2 04/16] pack v4: add version argument to write_pack_header

2013-09-09 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/pack-objects.c | 2 +- bulk-checkin.c | 2 +- pack-write.c | 7 +-- pack.h | 3 +-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/builtin/pack-objects.c

[PATCH v2 01/16] pack v4: allocate dicts from the beginning

2013-09-09 Thread Nguyễn Thái Ngọc Duy
commit_ident_table and tree_path_table are local to packv4-create.c and test-packv4.c. Move them out of add_*_dict_entries so add_*_dict_entries can be exported to pack-objects.c Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- packv4-create.c | 22 -- 1 file

[PATCH v2 16/16] index-pack: support completing thin packs v4

2013-09-09 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/index-pack.c | 53 +--- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/builtin/index-pack.c b/builtin/index-pack.c index dc9961b..8a6e2a3 100644 ---

[PATCH v2 15/16] index-pack: use nr_objects_final as sha1_table size

2013-09-09 Thread Nguyễn Thái Ngọc Duy
nr_objects in the next patch is used to reflect the number of actual objects in the stream, which may be smaller than the number recorded in pack header. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/index-pack.c | 13 +++-- 1 file changed, 7 insertions(+), 6

[PATCH v2 10/16] pack-objects: exclude commits out of delta objects in v4

2013-09-09 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/pack-objects.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 9613732..fb2394d 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@

[PATCH v2 07/16] pack-objects: add --version to specify written pack version

2013-09-09 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/pack-objects.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 33faea8..ef68fc5 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@

[PATCH v2 14/16] pack v4: support end-of-pack indicator in index-pack and pack-objects

2013-09-09 Thread Nguyễn Thái Ngọc Duy
In v2, the number of objects in the pack header indicates how many objects are sent. In v4 this is no longer true, that number includes the base objects ommitted by pack-objects. An end-of-pack is inserted just before the final SHA-1 to let index-pack knows when to stop. The EOP is zero (in

[PATCH v2 13/16] pack-objects: support writing pack v4

2013-09-09 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/pack-objects.c | 85 +- pack.h | 2 +- 2 files changed, 78 insertions(+), 9 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index

[PATCH v2 08/16] list-objects.c: add show_tree_entry callback to traverse_commit_list

2013-09-09 Thread Nguyễn Thái Ngọc Duy
This helps construct tree dictionary in pack v4. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/pack-objects.c | 2 +- builtin/rev-list.c | 4 ++-- list-objects.c | 9 - list-objects.h | 3 ++- upload-pack.c | 2 +- 5 files changed, 14

[PATCH v2 12/16] pack-objects: prepare SHA-1 table in v4

2013-09-09 Thread Nguyễn Thái Ngọc Duy
SHA-1 table is trickier than ident or path tables because it must contains exactly the number entries in pack. In the thin pack case it must also cover bases that will be appended by index-pack. The problem is not all preferred_base entries end up becoming actually needed. So we do a fake

[PATCH v2 06/16] pack-write.c: add pv4_encode_object_header

2013-09-09 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- pack-write.c | 33 + pack.h | 1 + 2 files changed, 34 insertions(+) diff --git a/pack-write.c b/pack-write.c index 36b88a3..c1e9da4 100644 --- a/pack-write.c +++ b/pack-write.c @@ -1,6 +1,7 @@

[PATCH v2 11/16] pack-objects: create pack v4 tables

2013-09-09 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/pack-objects.c | 62 -- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index fb2394d..60ea5a7 100644 ---

[PATCH v2 09/16] pack-objects: do not cache delta for v4 trees

2013-09-09 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/pack-objects.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index b38d3dc..9613732 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@

Re: [PATCH v2 15/16] index-pack: use nr_objects_final as sha1_table size

2013-09-09 Thread Nicolas Pitre
On Mon, 9 Sep 2013, Nguyễn Thái Ngọc Duy wrote: nr_objects in the next patch is used to reflect the number of actual objects in the stream, which may be smaller than the number recorded in pack header. This highlights an issue that has been nagging me for a while. We decided to send the

Re: [PATCH 0/3] Unconfuse git clone when two branches at are HEAD.

2013-09-09 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: One is to extend the ref format such that sha1 refs/heads/Test:HEAD would be considered a valid indicator of a symref relationship (i.e. using the typical 'colon' style). It would be appended after the regular refs, so all the existing refs are

Re: [PATCH 08/11] pack-objects: create pack v4 tables

2013-09-09 Thread Junio C Hamano
Nicolas Pitre n...@fluxnic.net writes: Is anyone still using --max-pack-size ? I'm wondering if producing multiple packs from pack-objects is really useful these days. If I remember correctly, this was created to allow the archiving of large packs onto CDROMs or the like. I thought this

Re: [PATCH] rebase: fix run_specific_rebase's use of return on FreeBSD

2013-09-09 Thread Junio C Hamano
Matthieu Moy matthieu@imag.fr writes: Since a1549e10, git-rebase--am.sh uses the shell's return statement, to mean return from the current file inclusion, which is POSIXly correct, but badly interpreted on FreeBSD, which returns from the current function, hence skips the finish_rebase

Re: [PATCH 0/3] Unconfuse git clone when two branches at are HEAD.

2013-09-09 Thread Andreas Krey
On Mon, 09 Sep 2013 07:44:04 +, Junio C Hamano wrote: ... I'd rather not go this route. Allowing refs/heads/master and local branches that forked from it in refs/heads/master/{a,b,c,...} could be a potentially useful future enhancement, Want! We're currently going the route of naming the

Re: [PATCH] send-email: don't call methods on undefined values

2013-09-09 Thread Junio C Hamano
brian m. carlson sand...@crustytoothpaste.net writes: If SSL verification is enabled in git send-email, we could attempt to call a method on an undefined value if the verification failed, since $smtp would end up being undef. Look up the error string in a way that will produce a helpful

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

2013-09-09 Thread Junio C Hamano
Nazri Ramliy ayieh...@gmail.com writes: Subject: git: run in a directory given with -C option This is similar in spirit to to make -C dir ... and tar -C dir The doubled-to to which I locally fixed when I queued the last one (together with other rewording to make it more agreeable and

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

2013-09-09 Thread Eric Sunshine
On Mon, Sep 9, 2013 at 12:32 PM, Junio C Hamano gits...@pobox.com wrote: Nazri Ramliy ayieh...@gmail.com writes: Subject: git: run in a directory given with -C option +-C path:: + Run as if git was started in 'path' instead of the current working + directory. When multiple '-C'

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

2013-09-09 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: First, the discussions on this thread show that it's hard to find the right behavior. My guess is that it's hard because we're trying to think for the users. I've used GNU Arch for a while, and this VCS was trying to impose what the developer

Re: [PATCH v2 15/16] index-pack: use nr_objects_final as sha1_table size

2013-09-09 Thread Junio C Hamano
Nicolas Pitre n...@fluxnic.net writes: ... I was wondering if some kind of prefix to the pack stream could be inserted onto the wire when sending a pack v4. Something like: 'T', 'H', 'I', 'N', actual_number_of_sent_objects_in_network_order This 8-byte prefix would simply be

Re: [PATCHv2 0/5] git-config and large integers

2013-09-09 Thread Junio C Hamano
Yikes. The updated series looks very sensible, but I already have the previous one in 'next'. Will do the usual revert and requeue dance... -- 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 v2 15/16] index-pack: use nr_objects_final as sha1_table size

2013-09-09 Thread Nicolas Pitre
On Mon, 9 Sep 2013, Junio C Hamano wrote: Nicolas Pitre n...@fluxnic.net writes: On Mon, 9 Sep 2013, Nguyễn Thái Ngọc Duy wrote: nr_objects in the next patch is used to reflect the number of actual objects in the stream, which may be smaller than the number recorded in pack header.

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

2013-09-09 Thread Eric Sunshine
On Mon, Sep 9, 2013 at 12:32 PM, Junio C Hamano gits...@pobox.com wrote: + echo initial in dir1/dir2 expected + git -C dir1/dir2 commit -m initial in dir1/dir2 to reduce possibilities of breaking this test in the future due to typos (e.g. somebody may want to say initial commit in

Re: [PATCH v2 15/16] index-pack: use nr_objects_final as sha1_table size

2013-09-09 Thread Junio C Hamano
Nicolas Pitre n...@fluxnic.net writes: On Mon, 9 Sep 2013, Nguyễn Thái Ngọc Duy wrote: nr_objects in the next patch is used to reflect the number of actual objects in the stream, which may be smaller than the number recorded in pack header. This highlights an issue that has been nagging me

Re: [PATCH v2 15/16] index-pack: use nr_objects_final as sha1_table size

2013-09-09 Thread Nicolas Pitre
On Mon, 9 Sep 2013, Junio C Hamano wrote: Nicolas Pitre n...@fluxnic.net writes: ... I was wondering if some kind of prefix to the pack stream could be inserted onto the wire when sending a pack v4. Something like: 'T', 'H', 'I', 'N',

pack v4 trees with a canonical base

2013-09-09 Thread Nicolas Pitre
While reviewing the pack v4 thin support Ive realized that some base tree objects appended to a thin pack won't be in pack v4 format. Hence the patch below to deal with that possibility. An eventual optimization to index-pack when completing a pack would be to attempt the encoding of appended

packv4: current performance

2013-09-09 Thread Nicolas Pitre
Of course pack v4, while significantly better on disk space, is still lagging behind pack v2 in terms of runtime performance. This is because right now the reading side is implemented as a compatibility layer that parses the packv4 data to regenerate a canonical object representation, which

Re: [PATCH 3/5] config: set errno in numeric git_parse_* functions

2013-09-09 Thread Jeff King
On Sun, Sep 08, 2013 at 08:36:35PM -0400, Eric Sunshine wrote: On Sun, Sep 8, 2013 at 4:36 AM, Jeff King p...@peff.net wrote: When we are parsing an integer or unsigned long, we use the strto*max functions, which properly set errno to ERANGE if we get a large value. However, we also do

Re: [PATCH v2 15/16] index-pack: use nr_objects_final as sha1_table size

2013-09-09 Thread Junio C Hamano
Nicolas Pitre n...@fluxnic.net writes: Do we know the actual number of objects to send during the capability negociation? No, and that is not what I meant. We know upfront after capability negotiation (by seeing a request to give them a thin-pack) that we will send, in addition to the usual

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

2013-09-09 Thread Jeff King
On Mon, Sep 09, 2013 at 11:47:45AM -0700, Junio C Hamano wrote: You are in favor of an _option_ to allow people to forbid a pull in a non-ff situation, and I think other people are also in agreement. So perhaps: - drop jc/pull-training-wheel and revert its merge from 'next'; - update

Re: [PATCH v2 15/16] index-pack: use nr_objects_final as sha1_table size

2013-09-09 Thread Nicolas Pitre
On Mon, 9 Sep 2013, Junio C Hamano wrote: Nicolas Pitre n...@fluxnic.net writes: Do we know the actual number of objects to send during the capability negociation? No, and that is not what I meant. We know upfront after capability negotiation (by seeing a request to give them a

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

2013-09-09 Thread Jeff King
On Sun, Sep 08, 2013 at 11:03:52AM +0100, John Keeping wrote: I know those are all balanced by some advantages of rebasing, but I also think they are things that can be troublesome for a user who does not fully grok the rebase process. I'm just wondering if we should mention both, but

[PULL REQUEST] initial pack v4 support

2013-09-09 Thread Nicolas Pitre
Junio, would you please pull the following into pu: git://git.linaro.org/people/nico/git This is the pack v4 work to date which is somewhat getting usable. It is time it gets more exposure, and possibly some more people's attention who would like to work on the missing parts as I need

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

2013-09-09 Thread Jeff King
On Sun, Sep 08, 2013 at 03:50:46AM -0400, Jeff King wrote: If you are interested, I can ask the opinion of some of the GitHub trainers. They see a lot of new users and have a sense of what kinds of confusion come up most frequently, what kinds of workflows they tend to see, etc. Their

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

2013-09-09 Thread John Keeping
On Mon, Sep 09, 2013 at 03:52:31PM -0400, Jeff King wrote: On Mon, Sep 09, 2013 at 11:47:45AM -0700, Junio C Hamano wrote: You are in favor of an _option_ to allow people to forbid a pull in a non-ff situation, and I think other people are also in agreement. So perhaps: - drop

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

2013-09-09 Thread Jeff King
On Mon, Sep 09, 2013 at 09:24:35PM +0100, John Keeping wrote: I think that would address the concern I raised, because it does not create a roadblock to new users accomplishing their task. They can ignore the warning, or choose merge as the default to shut up the warning (and it is easy

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

2013-09-09 Thread Matthieu Moy
John Keeping j...@keeping.me.uk writes: I think we need to make sure that we give instructions for how to go back if the default hasn't done what you wanted. Something like this: Your pull did not fast-forward, so Git has merged '$upstream' into your branch, which may not be correct

[Proposal] Clonable scripts

2013-09-09 Thread Niels Basjes
Hi, As we all know the hooks ( in .git/hooks ) are not cloned along with the code of a project. Now this is a correct approach for the scripts that do stuff like emailing the people responsible for releases or submitting the commit to a CI system. For several other things it makes a lot of sense

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

2013-09-09 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: You are in favor of an _option_ to allow people to forbid a pull in a non-ff situation, and I think other people are also in agreement. Yes. Having an option can't harm anybody, and there's a clear demand for that. So perhaps: - drop

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

2013-09-09 Thread John Keeping
On Mon, Sep 09, 2013 at 04:44:16PM -0400, Jeff King wrote: On Mon, Sep 09, 2013 at 09:24:35PM +0100, John Keeping wrote: I think that would address the concern I raised, because it does not create a roadblock to new users accomplishing their task. They can ignore the warning, or choose

Re: [Proposal] Clonable scripts

2013-09-09 Thread Hilco Wijbenga
On 9 September 2013 13:48, Niels Basjes ni...@basjes.nl wrote: If those scripts were how ever written in a language that is build into the git program and the script are run in such a way that they can only interact with the files in the local git (and _nothing_ outside of that) this would be

Re: [Proposal] Clonable scripts

2013-09-09 Thread Niels Basjes
On Mon, Sep 9, 2013 at 11:13 PM, Hilco Wijbenga hilco.wijbe...@gmail.com wrote: On 9 September 2013 13:48, Niels Basjes ni...@basjes.nl wrote: So I propose the following new feature: 1) A scripting language is put inside git. Perhaps a version of python or ruby or go or ... (no need for a

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

2013-09-09 Thread Jeff King
On Mon, Sep 09, 2013 at 10:50:31PM +0200, Matthieu Moy wrote: John Keeping j...@keeping.me.uk writes: I think we need to make sure that we give instructions for how to go back if the default hasn't done what you wanted. Something like this: Your pull did not fast-forward, so Git

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-09-09 Thread Richard Hansen
On 2013-09-08 21:23, Felipe Contreras wrote: The old configurations still work, but get deprecated. Should some tests for the deprecated configs be added? We wouldn't want to accidentally break those. diff --git a/Documentation/config.txt b/Documentation/config.txt index ec57a15..9489a59

Git: Having trouble merging two repositories by interweaving their histories

2013-09-09 Thread THILLOSEN Andreas
Hi, I recently stumbled over problems, while trying to merge two repositories (RepA and RepB) into a single one (RepM). I must mention that indexed files in RepA are totally distinct from indexed files in RepB, thus no conflict shall appear. The problem is that I never manage to get the exact

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

2013-09-09 Thread Philip Oakley
From: Jeff King p...@peff.net Sent: Monday, September 09, 2013 9:53 PM On Mon, Sep 09, 2013 at 10:50:31PM +0200, Matthieu Moy wrote: John Keeping j...@keeping.me.uk writes: I think we need to make sure that we give instructions for how to go back if the default hasn't done what you

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

2013-09-09 Thread Richard Hansen
On 2013-09-09 16:44, Jeff King wrote: On Mon, Sep 09, 2013 at 09:24:35PM +0100, John Keeping wrote: I think we need to make sure that we give instructions for how to go back if the default hasn't done what you wanted. Something like this: Your pull did not fast-forward, so Git has merged

Re: [Proposal] Clonable scripts

2013-09-09 Thread Ramkumar Ramachandra
Niels Basjes wrote: As we all know the hooks ( in .git/hooks ) are not cloned along with the code of a project. Now this is a correct approach for the scripts that do stuff like emailing the people responsible for releases or submitting the commit to a CI system. More often than not,

Re: [PATCH 0/3] Unconfuse git clone when two branches at are HEAD.

2013-09-09 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Sent: Monday, September 09, 2013 3:44 PM Philip Oakley philipoak...@iee.org writes: One is to extend the ref format such that sha1 refs/heads/Test:HEAD would be considered a valid indicator of a symref relationship (i.e. using the typical 'colon' style).

system administrator

2013-09-09 Thread WEBMASTER
Dear User Your e-mail size exceeds 2 GB, which is created by our Webmaster, is currently working on the 2.30GB, you can not send or receive new messages until you check your account. Fill out the form to verify your account. Please complete the information below to update your account (1)

Re: [PATCH 0/3] Unconfuse git clone when two branches at are HEAD.

2013-09-09 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: These look to work OK. Not sure If I've properly covered all the options. A nice feature is that ls-remote will find the fake ref ! $ git ls-remote /c/gitBundleTest1/RepoHEADnomaster.bundle Test:HEAD 41ccb18028d1cb6516251e94cef1cd5cb3f0bcb5

Re: [PULL REQUEST] initial pack v4 support

2013-09-09 Thread Junio C Hamano
I am very excited, but I already am deep into today's integration cycle, so I'd have to do this either tonight or early tomorrow. Thanks. -- 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 1/5] pull: rename pull.rename to pull.mode

2013-09-09 Thread Felipe Contreras
On Mon, Sep 9, 2013 at 4:23 PM, Richard Hansen rhan...@bbn.com wrote: On 2013-09-08 21:23, Felipe Contreras wrote: The old configurations still work, but get deprecated. Should some tests for the deprecated configs be added? We wouldn't want to accidentally break those. Probably, but Junio

What's cooking in git.git (Sep 2013, #02; Mon, 9)

2013-09-09 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'. The second batch of topics are now in 'master'. You can find the changes described here in the integration branches of the repositories listed

Re: [PATCH] send-email: don't call methods on undefined values

2013-09-09 Thread brian m. carlson
On Mon, Sep 09, 2013 at 09:45:10AM -0700, Junio C Hamano wrote: brian m. carlson sand...@crustytoothpaste.net writes: --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1234,7 +1234,7 @@ X-Mailer: git-send-email $gitversion if ($smtp-code == 220) {

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

2013-09-09 Thread Felipe Contreras
On Mon, Sep 9, 2013 at 3:24 PM, John Keeping j...@keeping.me.uk wrote: On Mon, Sep 09, 2013 at 03:52:31PM -0400, Jeff King wrote: On Mon, Sep 09, 2013 at 11:47:45AM -0700, Junio C Hamano wrote: You are in favor of an _option_ to allow people to forbid a pull in a non-ff situation, and I

Re: [PATCH v5 2/2] Add new @ shortcut for HEAD

2013-09-09 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Hmph, is the above sufficient? I added a case that mimics Stefano's original regression report (which is handled) and another that uses doubled @ for the same purpose of introducing a funny hierarchy, and it appears that checkout -b chokes

Re: [PATCH v2] git-svn: Fix termination issues for remote svn connections

2013-09-09 Thread Junio C Hamano
Uli Heller uli.hel...@daemons-point.com writes: From a763550fc59b756580f9b162839d2737c27f2fe3 Mon Sep 17 00:00:00 2001 From: Uli Heller uli.hel...@daemons-point.com Date: Tue, 3 Sep 2013 09:14:03 +0200 Subject: [PATCH] git-svn: Fix termination issues for remote svn connections None of the

Re: [PATCH] Doc: 'replace' merge and non-merge commits

2013-09-09 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: Merges are often treated as special case objects so tell users that they are not special here. Signed-off-by: Philip Oakley philipoak...@iee.org --- This updates my in-line patch given in [PATCH v3 07/11] Documentation/replace: tell that -f

Re: [PATCH v2] remote-bzr: reuse bzrlib transports when possible

2013-09-09 Thread Junio C Hamano
Richard Hansen rhan...@bbn.com writes: def do_export(parser): -global parsed_refs, dirname +global parsed_refs, dirname, transports As this has been acked by Felipe who knows the script the best, I'll apply this directly to 'master'. These additions of global transports however have

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

2013-09-09 Thread Felipe Contreras
On Mon, Sep 9, 2013 at 3:17 PM, Jeff King p...@peff.net wrote: On Sun, Sep 08, 2013 at 03:50:46AM -0400, Jeff King wrote: If you are interested, I can ask the opinion of some of the GitHub trainers. They see a lot of new users and have a sense of what kinds of confusion come up most

Re: [PATCH] GIT-VERSION-GEN: Do not require tags to be annotated

2013-09-09 Thread Junio C Hamano
Sebastian Schuberth sschube...@gmail.com writes: Which raises another question on my side: Isn't it tedious for you to both update DEF_VER *and* tag a version? Wouldn't it probably be less error prove (in the sense of keeping DEF_VER and tagged version in sync) to remove DEF_VER completely

Re: [PATCH 1/3] upload-pack: send the HEAD information

2013-09-09 Thread Junio C Hamano
Jeff King p...@peff.net writes: It somehow feels a little weird to me that we would output the information about refs/foo on the HEAD line. I see that you realized why the above is not the case in the downthread; the capability list is not about describing HEAD. The list happens to be on the

Re: Git: Having trouble merging two repositories by interweaving their histories

2013-09-09 Thread Andreas Schwab
THILLOSEN Andreas thillo...@free.fr writes: It implies interweaving their histories, so that I can get a state of both RepA and RepB around a same time period of time. This is only possible by rewriting every commit to point to a new tree containing the combined trees of the two repositories.

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

2013-09-09 Thread Felipe Contreras
On Mon, Sep 9, 2013 at 2:18 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Felipe Contreras felipe.contre...@gmail.com writes: On Sun, Sep 8, 2013 at 7:01 PM, brian m. carlson sand...@crustytoothpaste.net wrote: Yes, that would be me. My hesitance here is that as the one usually

Re: [PATCH] GIT-VERSION-GEN: Do not require tags to be annotated

2013-09-09 Thread Felipe Contreras
On Sun, Sep 8, 2013 at 12:41 PM, Junio C Hamano gits...@pobox.com wrote: Sebastian Schuberth sschube...@gmail.com writes: Which raises another question on my side: Isn't it tedious for you to both update DEF_VER *and* tag a version? Wouldn't it probably be less error prove (in the sense of

Re: [PATCH 2/2] version-gen: avoid messing the version

2013-09-09 Thread brian m. carlson
On Mon, Sep 09, 2013 at 02:00:55AM -0500, Felipe Contreras wrote: Of course not. First of all, who exactly is packaging release candidates nowadays? And second, why they can't they use the existing tools, like the 'version' file? Debian unstable, for one. However, they don't use RPMs and the

Re: Git: Having trouble merging two repositories by interweaving their histories

2013-09-09 Thread THILLOSEN Andreas
Le 09/10/13 01:06, Andreas Schwab a écrit : THILLOSEN Andreas thillo...@free.fr writes: It implies interweaving their histories, so that I can get a state of both RepA and RepB around a same time period of time. This is only possible by rewriting every commit to point to a new tree

Re: [PATCH v2 15/16] index-pack: use nr_objects_final as sha1_table size

2013-09-09 Thread Duy Nguyen
On Mon, Sep 9, 2013 at 10:01 PM, Nicolas Pitre n...@fluxnic.net wrote: However this means that the progress meter will now be wrong and that's terrible ! Users *will* complain that the meter doesn't reach 100% and they'll protest for being denied the remaining objects during the transfer !

Re: pack v4 trees with a canonical base

2013-09-09 Thread Duy Nguyen
On Tue, Sep 10, 2013 at 2:25 AM, Nicolas Pitre n...@fluxnic.net wrote: An eventual optimization to index-pack when completing a pack would be to attempt the encoding of appended tree objects into the packv4 format using the existing dictionary table in the pack, and fall back to the canonical

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

2013-09-09 Thread Brad King
Hi Folks, Here is the sixth 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, $gmane/233647, $gmane/233840, and $gmane/234324. Updates since the previous

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

2013-09-09 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 v6 7/8] update-ref: support multiple simultaneous updates

2013-09-09 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 v6 4/8] refs: factor delete_ref loose ref step into a helper

2013-09-09 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 f7d3c09..b14f59b 100644

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

2013-09-09 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 v6 5/8] refs: add function to repack without multiple refs

2013-09-09 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 v6 8/8] update-ref: add test cases covering --stdin signature

2013-09-09 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 | 639 ++ 1 file changed, 639 insertions(+) diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh

Re: [PATCH 2/2] version-gen: avoid messing the version

2013-09-09 Thread Felipe Contreras
On Mon, Sep 9, 2013 at 6:30 PM, brian m. carlson sand...@crustytoothpaste.net wrote: On Mon, Sep 09, 2013 at 02:00:55AM -0500, Felipe Contreras wrote: Of course not. First of all, who exactly is packaging release candidates nowadays? And second, why they can't they use the existing tools, like

Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

2013-09-09 Thread Jeff King
On Mon, Sep 09, 2013 at 05:49:36PM -0500, Felipe Contreras wrote: These deprecation warning messages should be written to stderr, and should probably be prefixed with WARNING: . Is there any deprecation warning that works this way? The ones in C code typically use warning(), which will

  1   2   >