Re: Save notes state when releasing

2013-09-23 Thread Francis Moreau
On Fri, Sep 20, 2013 at 12:34 PM, Jeff King p...@peff.net wrote: On Fri, Sep 20, 2013 at 07:38:17AM +0200, Francis Moreau wrote: I'm using notes in my project. I'm wondering if it's possible to save the state of the notes when I'm releasing/tagging a new version of my project so I can restore

Re: [PATCH/RFC 1/5] add a hashtable implementation that supports O(1) removal

2013-09-23 Thread Karsten Blees
Sorry for the delay, I've been on vacation... Am 12.09.2013 01:56, schrieb Junio C Hamano: Karsten Blees karsten.bl...@gmail.com writes: +#define FNV32_BASE ((unsigned int) 0x811c9dc5) +#define FNV32_PRIME ((unsigned int) 0x01000193) + ... +static inline unsigned int bucket(const hashmap

Re: [PATCH/RFC 1/5] add a hashtable implementation that supports O(1) removal

2013-09-23 Thread Karsten Blees
Am 12.09.2013 06:10, schrieb Junio C Hamano: Karsten Blees karsten.bl...@gmail.com writes: +/* + * Hashmap entry data structure, intended to be used as first member of user + * data structures. Consists of a pointer and an int. Ideally it should be It is technically correct to say this is

Re: [PATCH 00/15] Make Gnome Credential helper more Gnome-y and support ancient distros

2013-09-23 Thread John Szakmeister
On Sun, Sep 22, 2013 at 10:07:56PM -0700, Brandon Casey wrote: A few cleanups, followed by improved usage of the glib library (no need to reinvent the wheel when glib provides the necessary functionality), and then the addition of support for RHEL 4.x and 5.x. Brandon Casey (15):

Re: [PATCH 07/15] contrib/git-credential-gnome-keyring.c: ensure buffer is non-empty before accessing

2013-09-23 Thread Brandon Casey
Thanks. On Sun, Sep 22, 2013 at 10:43 PM, Felipe Contreras felipe.contre...@gmail.com wrote: Brandon Casey wrote: Ensure buffer length is non-zero before attempting to access the last element. Signed-off-by: Brandon Casey draf...@gmail.com ---

Re: [PATCH 00/15] Make Gnome Credential helper more Gnome-y and support ancient distros

2013-09-23 Thread Brandon Casey
On Mon, Sep 23, 2013 at 3:20 AM, John Szakmeister j...@szakmeister.net wrote: On Sun, Sep 22, 2013 at 10:07:56PM -0700, Brandon Casey wrote: A few cleanups, followed by improved usage of the glib library (no need to reinvent the wheel when glib provides the necessary functionality), and then

[PATCH v2] git-remote-mediawiki: bugfix for pages w/ 500 revisions

2013-09-23 Thread Benoit Person
Mediawiki introduces a new API for queries w/ more than 500 results in version 1.21. That change triggered an infinite loop while cloning a mediawiki with such a page. The latest API renamed and moved the continuing information in the response, necessary to build the next query. The code failed

Re: [PATCH] git-remote-mediawiki: bugfix for pages w/ 500 revisions

2013-09-23 Thread Jonathan Nieder
Matthieu Moy wrote: Benoit Person benoit.per...@gmail.com writes: For now, if the tests suite is run without the fix, the new test introduces an infinite loop. I am not sure if this should be handled ? (a timeout of some kind maybe ?) If the patch fix this, then it's not a really big

Re: [PATCH/RFC 0/7] Support for Ruby

2013-09-23 Thread Patrick Donnelly
Hello Felipe, On Sun, Sep 22, 2013 at 4:29 AM, Felipe Contreras felipe.contre...@gmail.com wrote: On Sun, Sep 22, 2013 at 3:12 AM, Fredrik Gustafsson iv...@iveqy.com wrote: And see my humble test of what the speedup would be for git-submodule even with a faulty lua integration (still

[PATCH v2 00/16] Make Gnome Credential helper more Gnome-y and support ancient distros

2013-09-23 Thread Brandon Casey
From: Brandon Casey draf...@gmail.com Mostly unchanged. Inserts a patch to fix the style issues for block statements. i.e. use if () instead of if() A couple early patches were reordered to improve logical flow. Updated the comment in the last patch to hopefully improve clarity wrt RHEL 4.X

[PATCH v2 02/16] contrib/git-credential-gnome-keyring.c: remove unused die() function

2013-09-23 Thread Brandon Casey
From: Brandon Casey draf...@gmail.com Signed-off-by: Brandon Casey draf...@gmail.com --- .../credential/gnome-keyring/git-credential-gnome-keyring.c| 10 -- 1 file changed, 10 deletions(-) diff --git a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c

[PATCH v2 10/16] contrib/git-credential-gnome-keyring.c: use secure memory functions for passwds

2013-09-23 Thread Brandon Casey
From: Brandon Casey draf...@gmail.com gnome-keyring provides functions for allocating non-pageable memory (if possible) intended to be used for storing passwords. Let's use them. Signed-off-by: Brandon Casey draf...@gmail.com --- .../gnome-keyring/git-credential-gnome-keyring.c| 21

[PATCH] git.txt: Fix asciidoc syntax of --*-pathspecs

2013-09-23 Thread Steffen Prohaska
Labeled lists require a double colon. Signed-off-by: Steffen Prohaska proha...@zib.de --- Documentation/git.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/git.txt b/Documentation/git.txt index 5d68d33..4c2757e 100644 --- a/Documentation/git.txt +++

[PATCH v2 03/16] contrib/git-credential-gnome-keyring.c: *style* use if () not if() etc.

2013-09-23 Thread Brandon Casey
From: Brandon Casey draf...@gmail.com Signed-off-by: Brandon Casey draf...@gmail.com --- .../gnome-keyring/git-credential-gnome-keyring.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c

[PATCH v2 15/16] contrib/git-credential-gnome-keyring.c: support ancient gnome-keyring

2013-09-23 Thread Brandon Casey
From: Brandon Casey draf...@gmail.com The gnome-keyring lib distributed with RHEL 5.X is ancient and does not provide a few of the functions/defines that more recent versions do, but mostly the API is the same. Let's provide the missing bits via macro definitions and function implementation.

Re: [PATCH/RFC 0/7] Support for Ruby

2013-09-23 Thread Felipe Contreras
On Mon, Sep 23, 2013 at 1:20 PM, Patrick Donnelly batr...@batbytes.com wrote: Hello Felipe, On Sun, Sep 22, 2013 at 4:29 AM, Felipe Contreras felipe.contre...@gmail.com wrote: On Sun, Sep 22, 2013 at 3:12 AM, Fredrik Gustafsson iv...@iveqy.com wrote: And see my humble test of what the

[PATCH v2 06/16] contrib/git-credential-gnome-keyring.c: strlen() returns size_t, not ssize_t

2013-09-23 Thread Brandon Casey
From: Brandon Casey draf...@gmail.com Also, initialization is not necessary since it is assigned before it is used. Signed-off-by: Brandon Casey draf...@gmail.com --- contrib/credential/gnome-keyring/git-credential-gnome-keyring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

[PATCH v2 14/16] contrib/git-credential-gnome-keyring.c: report failure to store password

2013-09-23 Thread Brandon Casey
From: Brandon Casey draf...@gmail.com Produce an error message when we fail to store a password to the keyring. Signed-off-by: Brandon Casey draf...@gmail.com --- Difference from v1: Additionally interpret GNOME_KEYRING_RESULT_CANCELLED as a successful exit status, since that means that the

[PATCH v2 07/16] contrib/git-credential-gnome-keyring.c: ensure buffer is non-empty before accessing

2013-09-23 Thread Brandon Casey
From: Brandon Casey draf...@gmail.com Ensure buffer length is non-zero before attempting to access the last element. Signed-off-by: Brandon Casey draf...@gmail.com --- contrib/credential/gnome-keyring/git-credential-gnome-keyring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

[PATCH v2 12/16] contrib/git-credential-gnome-keyring.c: use glib memory allocation functions

2013-09-23 Thread Brandon Casey
From: Brandon Casey draf...@gmail.com Rather than roll our own, let's use the memory allocation/free routines provided by glib. Signed-off-by: Brandon Casey draf...@gmail.com --- .../gnome-keyring/git-credential-gnome-keyring.c | 48 -- 1 file changed, 16 insertions(+), 32

Re: [PATCH v2] git-remote-mediawiki: bugfix for pages w/ 500 revisions

2013-09-23 Thread Matthieu Moy
Benoit Person benoit.per...@gmail.com writes: The latest API renamed and moved the continuing information in the response, necessary to build the next query. The code failed to retrieve that information but still detected that it was in a continuing query. As a result, it launched the same

[PATCH v2 11/16] contrib/git-credential-gnome-keyring.c: use secure memory for reading passwords

2013-09-23 Thread Brandon Casey
From: Brandon Casey draf...@gmail.com gnome-keyring provides functions to allocate non-pageable memory (if possible). Let's use them to allocate memory that may be used to hold secure data read from the keyring. Signed-off-by: Brandon Casey draf...@gmail.com ---

[PATCH v2 16/16] contrib/git-credential-gnome-keyring.c: support really ancient gnome-keyring

2013-09-23 Thread Brandon Casey
From: Brandon Casey draf...@gmail.com The gnome-keyring lib (0.4) distributed with RHEL 4.X is really ancient and does not provide most of the synchronous functions that even ancient releases do. Thankfully, we're only using one function that is missing. Let's emulate

[PATCH v2 13/16] contrib/git-credential-gnome-keyring.c: use glib messaging functions

2013-09-23 Thread Brandon Casey
From: Brandon Casey draf...@gmail.com Rather than roll our own, let's use the messaging functions provided by glib. Signed-off-by: Brandon Casey draf...@gmail.com --- .../gnome-keyring/git-credential-gnome-keyring.c | 33 +++--- 1 file changed, 4 insertions(+), 29 deletions(-)

[PATCH v2 08/16] contrib/git-credential-gnome-keyring.c: set Gnome application name

2013-09-23 Thread Brandon Casey
From: Brandon Casey draf...@gmail.com Since this is a Gnome application, let's set the application name to something reasonable. This will be displayed in Gnome dialog boxes e.g. the one that prompts for the user's keyring password. We add an include statement for glib.h and add the glib-2.0

[PATCH v2 01/16] contrib/git-credential-gnome-keyring.c: remove unnecessary pre-declarations

2013-09-23 Thread Brandon Casey
From: Brandon Casey draf...@gmail.com These are all defined before they are used, so it is not necessary to pre-declare them. Remove the pre-declarations. Signed-off-by: Brandon Casey draf...@gmail.com --- .../credential/gnome-keyring/git-credential-gnome-keyring.c | 13 - 1 file

[PATCH v2 09/16] contrib/git-credential-gnome-keyring.c: use gnome helpers in keyring_object()

2013-09-23 Thread Brandon Casey
From: Brandon Casey draf...@gmail.com Rather than carefully allocating memory for sprintf() to write into, let's make use of the glib helper function g_strdup_printf(), which makes things a lot easier and less error-prone. Signed-off-by: Brandon Casey draf...@gmail.com ---

[PATCH v2 05/16] contrib/git-credential-gnome-keyring.c: exit non-zero when called incorrectly

2013-09-23 Thread Brandon Casey
From: Brandon Casey draf...@gmail.com If the correct arguments were not specified, this program should exit non-zero. Let's do so. Signed-off-by: Brandon Casey draf...@gmail.com --- contrib/credential/gnome-keyring/git-credential-gnome-keyring.c | 2 +- 1 file changed, 1 insertion(+), 1

[PATCH v2 04/16] contrib/git-credential-gnome-keyring.c: add static where applicable

2013-09-23 Thread Brandon Casey
From: Brandon Casey draf...@gmail.com Mark global variable and functions as static. Signed-off-by: Brandon Casey draf...@gmail.com --- .../gnome-keyring/git-credential-gnome-keyring.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git

Re: [PATCH/RFC 0/7] Support for Ruby

2013-09-23 Thread Felipe Contreras
Junio C Hamano wrote: [on vacaion, with only gmail webmail UI; please excuse me if this message comes out badly formatted or gets dropped by vger.kernel.org] On Sat, Sep 21, 2013 at 4:56 PM, brian m. carlson sand...@crustytoothpaste.net wrote: On Sat, Sep 21, 2013 at 05:52:05PM -0500,

Re: [PATCH/RFC 0/7] Support for Ruby

2013-09-23 Thread Patrick Donnelly
On Mon, Sep 23, 2013 at 2:53 PM, Felipe Contreras felipe.contre...@gmail.com wrote: Yes, but that's not what the words said, the words said 'lua integration' and 'ruby integration' would take that much. Either way it doesn't matter, shared libraries exist for a reason. We don't need to

[PATCH] git-prune-packed.txt: Fix reference to GIT_OBJECT_DIRECTORY

2013-09-23 Thread Steffen Prohaska
git-prune-packed operates on GIT_OBJECT_DIRECTORY. See 'environment.c', git_object_dir = getenv(DB_ENVIRONMENT); and cache.h, #define DB_ENVIRONMENT GIT_OBJECT_DIRECTORY Signed-off-by: Steffen Prohaska proha...@zib.de --- Documentation/git-prune-packed.txt | 2 +- 1 file changed, 1

Re: [PATCH/RFC 0/7] Support for Ruby

2013-09-23 Thread Felipe Contreras
On Mon, Sep 23, 2013 at 2:20 PM, Patrick Donnelly batr...@batbytes.com wrote: On Mon, Sep 23, 2013 at 2:53 PM, Felipe Contreras felipe.contre...@gmail.com wrote: Yes, but that's not what the words said, the words said 'lua integration' and 'ruby integration' would take that much. Either way

Re: [PATCH v2 15/16] contrib/git-credential-gnome-keyring.c: support ancient gnome-keyring

2013-09-23 Thread Felipe Contreras
On Mon, Sep 23, 2013 at 1:49 PM, Brandon Casey bca...@nvidia.com wrote: From: Brandon Casey draf...@gmail.com The gnome-keyring lib distributed with RHEL 5.X is ancient and does not provide a few of the functions/defines that more recent versions do, but mostly the API is the same. Let's

Re: [PATCH v2 00/16] Make Gnome Credential helper more Gnome-y and support ancient distros

2013-09-23 Thread Felipe Contreras
On Mon, Sep 23, 2013 at 1:49 PM, Brandon Casey bca...@nvidia.com wrote: From: Brandon Casey draf...@gmail.com Mostly unchanged. Inserts a patch to fix the style issues for block statements. i.e. use if () instead of if() A couple early patches were reordered to improve logical flow.

Re: [PATCH v2] git-remote-mediawiki: bugfix for pages w/ 500 revisions

2013-09-23 Thread Eric Sunshine
On Mon, Sep 23, 2013 at 1:26 PM, Benoit Person benoit.per...@gmail.com wrote: diff --git a/contrib/mw-to-git/t/t9365-continuing-queries.sh b/contrib/mw-to-git/t/t9365-continuing-queries.sh new file mode 100755 index 000..6fb5df4 --- /dev/null +++

Re: [PATCH] diff: add a config option to control orderfile

2013-09-23 Thread Michael S. Tsirkin
On Fri, Sep 20, 2013 at 12:32:26AM +0300, Michael S. Tsirkin wrote: On Tue, Sep 17, 2013 at 04:56:16PM -0400, Jeff King wrote: On Tue, Sep 17, 2013 at 11:38:07PM +0300, Michael S. Tsirkin wrote: A problem with both schemes, though, is that they are not backwards-compatible with

[PATCH v2 0/3] Add cleanup action to perf-lib

2013-09-23 Thread Thomas Gummerer
This patch series comes out of the discussion at $gmane/234874, adding a new (modern) form of writing tests. This form allows easier extensibility of test cases. In the next patch a --cleanup option is added for performance tests. The option does nothing for normal tests, as test_when_finished

[PATCH v2 1/3] test-lib: introduce modern style tests

2013-09-23 Thread Thomas Gummerer
From: Junio C Hamano gits...@pobox.com Add a new, extensible style for tests that allows the addition of new parameters other than the prerequitites Signed-off-by: Junio C Hamano gits...@pobox.com Signed-off-by: Thomas Gummerer t.gumme...@gmail.com --- t/README| 24

[PATCH v2 2/3] perf-lib: add cleanup option

2013-09-23 Thread Thomas Gummerer
Add a --cleanup for the performance tests. This option can be used to clean up the tested repository after each time the performance tests are run. The option can be specified for normal tests too, although it will not do anything for them. Use test_when_finished for those tests.

[PATCH v2 3/3] p0003-index.sh: add perf test for the index formats

2013-09-23 Thread Thomas Gummerer
From: Thomas Rast tr...@inf.ethz.ch Add a performance test for index version [23]/4 by using git update-index --index-version=x, thus testing both the reader and the writer speed of all index formats. Signed-off-by: Thomas Rast tr...@inf.ethz.ch Signed-off-by: Thomas Gummerer

What's cooking in git.git (Sep 2013, #07; Mon, 23)

2013-09-23 Thread Jonathan Nieder
What's cooking in git.git (Sep 2013, #07; Mon, 23) -- 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 fifth batch of topics are in

[PATCH] git-svn.txt: mention how to rebuild rev_map files

2013-09-23 Thread Keshav Kini
The man page for `git svn` describes a situation in which 'git svn' will not be able to rebuild your .git/svn/**/.rev_map files, but no mention is made of in what circumstances `git svn` *will* be able to do so, or how to get `git svn` to do so. This patch adds some language to the description of

Re: What's cooking in git.git (Sep 2013, #07; Mon, 23)

2013-09-23 Thread Stefan Beller
On 09/23/2013 11:10 PM, Jonathan Nieder wrote: You can find the changes described here in the integration branches at https://repo.or.cz/r/git/jrn.git I am still catching up on patches sent since last week. If I have missed yours, do not despair, but feel free to send me a reminder to

Re: [PATCH] diff: add a config option to control orderfile

2013-09-23 Thread Jonathan Nieder
Hi, Michael S. Tsirkin wrote: On Tue, Sep 17, 2013 at 04:56:16PM -0400, Jeff King wrote: A problem with both schemes, though, is that they are not backwards-compatible with existing git-patch-id implementations. [...] It may be esoteric enough not to worry about, though. Yeah, I think it

Re: What's cooking in git.git (Sep 2013, #07; Mon, 23)

2013-09-23 Thread Jonathan Nieder
Stefan Beller wrote: On 09/23/2013 11:10 PM, Jonathan Nieder wrote: https://repo.or.cz/r/git/jrn.git [...] How would I get these changes? A plain git fetch https://repo.or.cz/r/git/jrn.git doesn't work, as it yields: fatal: unable to access 'https://repo.or.cz/r/git/jrn.git/':

Re: What's cooking in git.git (Sep 2013, #07; Mon, 23)

2013-09-23 Thread Jonathan Nieder
Stefan Beller wrote: git fetch https://repo.or.cz/r/git/jrn.git doesn't work, as it yields: fatal: unable to access 'https://repo.or.cz/r/git/jrn.git/': server certificate verification failed. CAfile: /etc/ssl/certs/ca-certificates.crt CRLfile: none Ah, figured it out.

Re: What's cooking in git.git (Sep 2013, #07; Mon, 23)

2013-09-23 Thread Kyle J. McKay
On Sep 23, 2013, at 14:54, Jonathan Nieder wrote: Stefan Beller wrote: git fetch https://repo.or.cz/r/git/jrn.git doesn't work, as it yields: fatal: unable to access 'https://repo.or.cz/r/git/jrn.git/': server certificate verification failed. CAfile: /etc/ssl/certs/ca-

Самое результативное средство в борьбе с излишним весом

2013-09-23 Thread anqelina-2012
Травяной чай представляется мощным естественным антиоксидантом http://jilc.net/fba5

Re: [PATCH v2 00/16] Make Gnome Credential helper more Gnome-y and support ancient distros

2013-09-23 Thread Jeff King
On Mon, Sep 23, 2013 at 11:49:01AM -0700, Brandon Casey wrote: Brandon Casey (16): contrib/git-credential-gnome-keyring.c: remove unnecessary pre-declarations [...] Thanks, I think this is a good change. There were patches[1] from Philipp about a year ago that went in the opposite

Re: [PATCH] git.txt: Fix asciidoc syntax of --*-pathspecs

2013-09-23 Thread Jeff King
On Mon, Sep 23, 2013 at 08:54:35PM +0200, Steffen Prohaska wrote: Labeled lists require a double colon. Thanks, this looks good. While looking at the git.txt source, I noticed it is quite awkward to read due to the size of the stalenotes section. The patch below moves that section out to its

Re: Using alternate working directory

2013-09-23 Thread Ram Rachum
Does anyone care to help? I'd really like to solve this :( On 22/9/2013 00:04, Ram Rachum wrote: Hi everybody! I need some help with Git. I'm making a script `gm` which lets me merge one branch into another without having either checked out. It works for some cases but not all. I'm trying

Re: [PATCH v3] build: add default aliases

2013-09-23 Thread Jeff King
On Sat, Sep 21, 2013 at 02:20:21PM -0500, Felipe Contreras wrote: For now simply add a few common aliases. co = checkout ci = commit rb = rebase st = status Are these the best definitions of those shortcuts? It seems[1] that some people define ci as commit -a, and some people

Re: Using alternate working directory

2013-09-23 Thread Jeff King
On Sun, Sep 22, 2013 at 12:04:24AM +0300, Ram Rachum wrote: I'm making a script `gm` which lets me merge one branch into another without having either checked out. It works for some cases but not all. I'm trying to make it work for more cases. I concluded that the best way to do it would be

Re: [PATCH 1/2] fetch: add missing documentation

2013-09-23 Thread Jeff King
On Sat, Sep 21, 2013 at 09:09:22AM -0500, Felipe Contreras wrote: There's no mention of the 'origin' default, or the fact that the upstream tracking branch remote is used. Sounds like a good thing to mention. diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index

Re: [PATCH 2/2] remote: fix trivial memory leak

2013-09-23 Thread Jeff King
On Sat, Sep 21, 2013 at 09:09:23AM -0500, Felipe Contreras wrote: diff --git a/remote.c b/remote.c index efcba93..654e7f5 100644 --- a/remote.c +++ b/remote.c @@ -480,7 +480,6 @@ static void read_config(void) int flag; if (default_remote_name) /* did this already */

Re: [PATCH 1/2] fetch: add missing documentation

2013-09-23 Thread Felipe Contreras
On Tue, Sep 24, 2013 at 12:03 AM, Jeff King p...@peff.net wrote: On Sat, Sep 21, 2013 at 09:09:22AM -0500, Felipe Contreras wrote: There's no mention of the 'origin' default, or the fact that the upstream tracking branch remote is used. Sounds like a good thing to mention. diff --git

Re: [PATCH 1/2] fetch: add missing documentation

2013-09-23 Thread Jeff King
On Tue, Sep 24, 2013 at 12:23:21AM -0500, Felipe Contreras wrote: Should this be upstream remote rather than upstream branch? I don't think we should be looking at branch.*.merge at all for git-fetch. As a general user, how do I configure the upstream remote? Yeah, it's not a term we use

Re: [PATCH v3] build: add default aliases

2013-09-23 Thread Felipe Contreras
On Mon, Sep 23, 2013 at 11:53 PM, Jeff King p...@peff.net wrote: On Sat, Sep 21, 2013 at 02:20:21PM -0500, Felipe Contreras wrote: For now simply add a few common aliases. co = checkout ci = commit rb = rebase st = status Are these the best definitions of those shortcuts? It

Re: [PATCH] git-compat-util: Avoid strcasecmp() being inlined

2013-09-23 Thread Jeff King
On Fri, Sep 20, 2013 at 08:21:04AM +0200, Piotr Krukowiecki wrote: I can't think off-hand of a way to do so using preprocessor tricks, and even if we could, I suspect the result would end up quite ugly. What I meant was: can we add a test (in t/) which greps git source code and fails if it

Re: [PATCH 1/2] fetch: add missing documentation

2013-09-23 Thread Felipe Contreras
On Tue, Sep 24, 2013 at 12:30 AM, Jeff King p...@peff.net wrote: On Tue, Sep 24, 2013 at 12:23:21AM -0500, Felipe Contreras wrote: Should this be upstream remote rather than upstream branch? I don't think we should be looking at branch.*.merge at all for git-fetch. As a general user, how

Re: [PATCH v3] build: add default aliases

2013-09-23 Thread Jeff King
On Tue, Sep 24, 2013 at 12:32:46AM -0500, Felipe Contreras wrote: You are making things more consistent for people who already define those aliases in the same way (they are available everywhere, even if they have not moved their config to a new installation), but less so for people who

Re: [PATCH 1/2] fetch: add missing documentation

2013-09-23 Thread Jeff King
On Tue, Sep 24, 2013 at 12:36:38AM -0500, Felipe Contreras wrote: Yeah, it's not a term we use elsewhere, so it's not great. Probably default remote would be better, or even just say branch.*.remote for the current branch or something. Yeah, general users don't know what you are talking

Re: [PATCH] diff: add a config option to control orderfile

2013-09-23 Thread Jeff King
On Mon, Sep 23, 2013 at 02:37:29PM -0700, Jonathan Nieder wrote: Add --order-sensitive to get historical unstable behaviour. The --order-sensitive option seems confusing. How do I use it to replicate a historical patch-id? If I record all options that might have influenced ordering

Re: [PATCH v3] build: add default aliases

2013-09-23 Thread Felipe Contreras
On Tue, Sep 24, 2013 at 12:37 AM, Jeff King p...@peff.net wrote: On Tue, Sep 24, 2013 at 12:32:46AM -0500, Felipe Contreras wrote: You are making things more consistent for people who already define those aliases in the same way (they are available everywhere, even if they have not moved

Re: [PATCH] diff: add a config option to control orderfile

2013-09-23 Thread Michael S. Tsirkin
On Mon, Sep 23, 2013 at 02:37:29PM -0700, Jonathan Nieder wrote: Hi, Michael S. Tsirkin wrote: On Tue, Sep 17, 2013 at 04:56:16PM -0400, Jeff King wrote: A problem with both schemes, though, is that they are not backwards-compatible with existing git-patch-id implementations. [...]

Re: [PATCH 1/2] fetch: add missing documentation

2013-09-23 Thread Felipe Contreras
On Tue, Sep 24, 2013 at 12:40 AM, Jeff King p...@peff.net wrote: On Tue, Sep 24, 2013 at 12:36:38AM -0500, Felipe Contreras wrote: Yeah, it's not a term we use elsewhere, so it's not great. Probably default remote would be better, or even just say branch.*.remote for the current branch or