But in `git checkout --patch`

2014-12-15 Thread Benjamin Quorning
I'm not entirely sure how you like your bug reports, so I'll just the best I can :-) $ git --version git version 2.2.0 $ uname -a Darwin buzz.local 13.4.0 Darwin Kernel Version 13.4.0: Sun Aug 17 19:50:11 PDT 2014; root:xnu-2422.115.4~1/RELEASE_X86_64 x86_64 Reproduction steps: 1. A repository

[PATCH] Update documentation occurrences of filename .sh

2014-12-15 Thread Peter van der Does
Documentation in the completion scripts for Bash and Zsh state the wrong filenames. Signed-off-by: Peter van der Does pe...@avirtualhome.com --- contrib/completion/git-completion.bash | 4 ++-- contrib/completion/git-completion.zsh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

[PATCH v2] git-gui: fix problem with gui.maxfilesdisplayed

2014-12-15 Thread Csaba Kiraly
gui.maxfilesdisplayed (added in dd6451f9c7c5a36d3006231b618ac6da06c7c7b4) was applied brute force on the file list in alphabetic order. As a result, files that had modifications might not be displayed by git-gui. Even worse, files that are already in the index might not be displayed, which makes

[PATCH] add--interactive: leave main loop on read error

2014-12-15 Thread Jeff King
On Mon, Dec 15, 2014 at 03:41:45PM +0100, Benjamin Quorning wrote: Reproduction steps: 1. A repository with a changed file, but no staged changes. 2. Execute `git checkout --patch` 3. When asked, press `e` to edit a chunk (opens an external editor in my case) 4. With the editor still open,

Re: [PATCH/RFC 4/4] attr: avoid heavy work when we know the specified attr is not defined

2014-12-15 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Tue, Dec 09, 2014 at 04:18:57PM -0800, Junio C Hamano wrote: ... I smell that a much better split is possible. ... Something like this? Definitely looks better. Yeah, I was lazy and did not try it myself to see what the end result would look like

Re: [PATCH] win32: syslog: prevent potential realloc memory leak

2014-12-15 Thread Junio C Hamano
Arjun Sreedharan arjun...@gmail.com writes: use a temporary variable to free the memory in case realloc() fails. Signed-off-by: Arjun Sreedharan arjun...@gmail.com --- compat/win32/syslog.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compat/win32/syslog.c

Re: [PATCH v3 11/23] untracked cache: load from UNTR index extension

2014-12-15 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: +struct untracked_cache *read_untracked_extension(const void *data, unsigned long sz) +{ + const struct ondisk_untracked_cache *ouc; + struct untracked_cache *uc; + struct read_data rd; + const unsigned char *next = data,

[PATCH 3/5] receive-pack.c: use a single ref_transaction for atomic pushes

2014-12-15 Thread Stefan Beller
From: Ronnie Sahlberg sahlb...@google.com Update receive-pack to use an atomic transaction iff the client negotiated that it wanted atomic-push. This leaves the default behavior to be the old non-atomic one ref at a time update. This is to cause as little disruption as possible to existing

[PATCH 1/5] receive-pack.c: add protocol support to negotiate atomic-push

2014-12-15 Thread Stefan Beller
From: Ronnie Sahlberg sahlb...@google.com This adds support to the protocol between send-pack and receive-pack to * allow receive-pack to inform the client that it has atomic push capability * allow send-pack to request atomic push back. There is currently no setting in send-pack to actually

[PATCH 0/5] Add a flag to push atomically

2014-12-15 Thread Stefan Beller
This patch series adds a flag to git push to update the remote refs atomically. It was part of a longer patch series[1]. This series applies on top of origin/mh/reflog-expire It can also be found at [2]. Change since picking the series up from Ronnie. * other anchor point (i.e. where the

[PATCH 2/5] send-pack.c: add an --atomic-push command line argument

2014-12-15 Thread Stefan Beller
From: Ronnie Sahlberg sahlb...@google.com This adds support to send-pack to negotiate and use atomic pushes iff the server supports it. Atomic pushes are activated by a new command line flag --atomic-push. In order to do this we also need to change the semantics for send_pack() slightly. The

[PATCH 5/5] t5543-atomic-push.sh: add basic tests for atomic pushes

2014-12-15 Thread Stefan Beller
This adds tests for the atomic push option. The first four tests check if the atomic option works in good conditions and the last three patches check if the atomic option prevents any change to be pushed if just one ref cannot be updated. Signed-off-by: Stefan Beller sbel...@google.com ---

[PATCH 4/5] push.c: add an --atomic-push argument

2014-12-15 Thread Stefan Beller
From: Ronnie Sahlberg sahlb...@google.com Add a command line argument to the git push command to request atomic pushes. Signed-off-by: Ronnie Sahlberg sahlb...@google.com Signed-off-by: Stefan Beller sbel...@google.com --- Documentation/git-push.txt | 8 +++- builtin/push.c | 2

remote helper example with push/fetch capabilities

2014-12-15 Thread Klein W
Is there any example of a remote helper [0] with push and fetch capabilities? The git-remote-testgit.sh example [1] only has import/export capabilities. Also, what are the advantages and disadvantages of a remote helper with push/fetch capabilities vs a remote helper with import/export

What's cooking in git.git (Dec 2014, #03; Mon, 15)

2014-12-15 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 'next' branch has been rewound and rebuilt on top of 2.2; I expect this to be a short and light cycle that would not add too many new

Re: remote helper example with push/fetch capabilities

2014-12-15 Thread Jonathan Nieder
Hi, Klein W wrote: Is there any example of a remote helper [0] with push and fetch capabilities? Sure --- see remote-curl.c. There's also the connect capability. builtin/remote-ext.c and builtin/remote-fd.c are examples using that one. [...] Also, what are the advantages and disadvantages

Re: [PATCH 1/5] receive-pack.c: add protocol support to negotiate atomic-push

2014-12-15 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: From: Ronnie Sahlberg sahlb...@google.com This adds support to the protocol between send-pack and receive-pack to * allow receive-pack to inform the client that it has atomic push capability * allow send-pack to request atomic push back. There is

Re: [PATCH 2/5] send-pack.c: add an --atomic-push command line argument

2014-12-15 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: -static int ref_update_to_be_sent(const struct ref *ref, const struct send_pack_args *args) +static int ref_update_to_be_sent(const struct ref *ref, const struct send_pack_args *args, int *atomic_push_failed) Hmph. Is atomic push so special that it

Re: [PATCH 3/5] receive-pack.c: use a single ref_transaction for atomic pushes

2014-12-15 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: @@ -832,34 +834,56 @@ static const char *update(struct command *cmd, struct shallow_info *si) cmd-did_not_exist = 1; } } - if (delete_ref(namespaced_name, old_sha1, 0)) {

Re: remote helper example with push/fetch capabilities

2014-12-15 Thread Klein W
On Mon, Dec 15, 2014 at 3:47 PM, Jonathan Nieder jrnie...@gmail.com wrote: Sure --- see remote-curl.c. There's also the connect capability. builtin/remote-ext.c and builtin/remote-fd.c are examples using that one. Thanks. Also, what are the advantages and disadvantages of a remote helper

Re: remote helper example with push/fetch capabilities

2014-12-15 Thread Jonathan Nieder
Klein W wrote: On Mon, Dec 15, 2014 at 3:47 PM, Jonathan Nieder jrnie...@gmail.com wrote: It mainly has to do with what it is convenient for your helper to produce. If the helper would find it more convenient to write native git objects (for example because the remote server speaks a

Re: remote helper example with push/fetch capabilities

2014-12-15 Thread Junio C Hamano
Klein W winekl...@gmail.com writes: Is there any example of a remote helper [0] with push and fetch capabilities? The git-remote-testgit.sh example [1] only has import/export capabilities. Also, what are the advantages and disadvantages of a remote helper with push/fetch capabilities vs a

Re: [PATCH 4/5] push.c: add an --atomic-push argument

2014-12-15 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: From: Ronnie Sahlberg sahlb...@google.com Add a command line argument to the git push command to request atomic pushes. Signed-off-by: Ronnie Sahlberg sahlb...@google.com Signed-off-by: Stefan Beller sbel...@google.com --- Makes sense, modulo a

Re: [PATCH 5/5] t5543-atomic-push.sh: add basic tests for atomic pushes

2014-12-15 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: This adds tests for the atomic push option. The first four tests check if the atomic option works in good conditions and the last three patches check if the atomic option prevents any change to be pushed if just one ref cannot be updated.

Re: [PATCH 1/5] receive-pack.c: add protocol support to negotiate atomic-push

2014-12-15 Thread Stefan Beller
On Mon, Dec 15, 2014 at 12:53 PM, Junio C Hamano gits...@pobox.com wrote: Hmph, am I reading the patch to send-pack.c correctly? It detects if the other side supports the capability and leaves it in atomic_push_supported variable for later use, and also requests the feature to be activated

Re: [PATCH 0/5] Add a flag to push atomically

2014-12-15 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: This patch series adds a flag to git push to update the remote refs atomically. It was part of a longer patch series[1]. This series applies on top of origin/mh/reflog-expire It can also be found at [2]. Change since picking the series up from

Re: remote helper example with push/fetch capabilities

2014-12-15 Thread Klein W
On Mon, Dec 15, 2014 at 4:44 PM, Jonathan Nieder jrnie...@gmail.com wrote: I'm trying to write a remote helper for hosting git remotes on Amazon S3. Do you have any intuition about which capabilities would work best for this case? fetch/push. I'd suggest looking at the dumb HTTP code

Re: [PATCH] add--interactive: leave main loop on read error

2014-12-15 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Mon, Dec 15, 2014 at 03:41:45PM +0100, Benjamin Quorning wrote: Reproduction steps: 1. A repository with a changed file, but no staged changes. 2. Execute `git checkout --patch` 3. When asked, press `e` to edit a chunk (opens an external editor in my

Re: [PATCH v2 1/2] send-email: align RFC 2047 decoding more closely with the spec

2014-12-15 Thread Junio C Hamano
Thanks; queued both patches. -- 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

限量$799享受快感,不知不覺就瘦了uzwltcr51tfm

2014-12-15 Thread kesiojhajhwe tdgda
婁千榮uzwltcr51tfm 「體重老是減不下來」 「總是中途就放棄了」這樣的人, 說不定是因為意識胖子化的原因! 這麼一來, 不管怎麼減都只是浪費時間而已……。 在此要來介紹讓你改變肥胖體質, 百萬人使用成功的方法 http://bit.ly/1vO7tjS tsunj婁千榮 -- 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: Kedves: Webmail Elofizeto

2014-12-15 Thread Maria Kovalska
From: Maria Kovalska Sent: Tue 12/16/2014 2:01 Subject: Kedves: Webmail Elofizeto Kedves: Webmail Elofizeto Felhívjuk figyelmét, hogy az e-mail fiók meghaladta tárolókapacitás. Ön nem tud küldeni és fogadni e-maileket és a e-mail fiókja törlésre kerül a

[PATCH] remote: allow adding remote w same name as alias

2014-12-15 Thread Anastas Dancha
From f80bdf3272e7bdf790ee67fb94196a8aa139331f Mon Sep 17 00:00:00 2001 From: Anastas Dancha anap...@random.io Date: Mon, 15 Dec 2014 16:30:50 -0500 Subject: [PATCH] remote: allow adding remote w same name as alias When ~/.gitconfig contains an alias (i.e. myremote) and you are adding a new remote

[PATCH] t5400: remove dead code

2014-12-15 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com --- Notes: When debugging the atomic push series I wondered if we want to have tests for the atomic push as well as for atomic send-pack. So I looked at the t5400 test if I could easily add tests for send-pack. I don't think I will