Re: [PATCH] commit: make default of cleanup option configurable

2013-01-09 Thread Ralf Thielow
Hi, 2013/1/9 Jonathan Nieder jrnie...@gmail.com: Hi, Ralf Thielow wrote: The default of the cleanup option in git commit is not configurable. Users who don't want to use the default have to pass this option on every commit since there's no way to configure it. Could you give an example?

[PATCH 04/19] reset: don't allow git reset -- $pathspec in bare repo

2013-01-09 Thread Martin von Zweigbergk
--- builtin/reset.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/builtin/reset.c b/builtin/reset.c index 045c960..664fad9 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -295,8 +295,6 @@ int cmd_reset(int argc, const char **argv, const char *prefix)

[PATCH 02/19] reset $pathspec: exit with code 0 if successful

2013-01-09 Thread Martin von Zweigbergk
git reset $pathspec currently exits with a non-zero exit code if the worktree is dirty after resetting, which is inconsistent with reset without pathspec, and it makes it harder to know whether the command really failed. Change it to exit with code 0 regardless of whether the worktree is dirty so

[PATCH 15/19] reset.c: finish entire cmd_reset() whether or not pathspec is given

2013-01-09 Thread Martin von Zweigbergk
By not returning from inside the if (pathspec) block, we can let the pathspec-aware and pathspec-less code share a bit more, making it easier to make future changes that should affect both cases. This also highlights the similarity between read_from_tree() and reset_index(). --- Should error

[PATCH 05/19] reset.c: extract function for parsing arguments

2013-01-09 Thread Martin von Zweigbergk
Declutter cmd_reset() a bit by moving out the argument parsing to its own function. --- builtin/reset.c | 71 ++--- 1 file changed, 38 insertions(+), 33 deletions(-) diff --git a/builtin/reset.c b/builtin/reset.c index 664fad9..9473725 100644

[PATCH 19/19] reset [--mixed]: use diff-based reset whether or not pathspec was given

2013-01-09 Thread Martin von Zweigbergk
Thanks to b65982b (Optimize diff-index --cached using cache-tree, 2009-05-20), resetting with paths is much faster than resetting without paths. Some timings for the linux-2.6 repo to illustrate this (best of five, warm cache): reset reset . real0m0.219s0m0.080s user

[PATCH 10/19] reset --keep: only write index file once

2013-01-09 Thread Martin von Zweigbergk
git reset --keep calls reset_index_file() twice, first doing a two-way merge to the target revision, updating the index and worktree, and then resetting the index. After each call, we write the index file. In the unlikely event that the second call to reset_index_file() fails, the index will have

[PATCH 13/19] reset.c: move lock, write and commit out of update_index_refresh()

2013-01-09 Thread Martin von Zweigbergk
In preparation for the/a following patch, move the locking, writing and committing of the index file out of update_index_refresh(). The code duplication caused will soon be taken care of. What remains of update_index_refresh() is just one line, but it is still called from two places, so let's

[PATCH 09/19] reset.c: replace switch by if-else

2013-01-09 Thread Martin von Zweigbergk
--- builtin/reset.c | 13 +++-- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/builtin/reset.c b/builtin/reset.c index 42d1563..05ccfd4 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -351,18 +351,11 @@ int cmd_reset(int argc, const char **argv, const char *prefix)

[PATCH 01/19] reset $pathspec: no need to discard index

2013-01-09 Thread Martin von Zweigbergk
Since 34110cd (Make 'unpack_trees()' have a separate source and destination index, 2008-03-06), the index no longer gets clobbered by do_diff_cache() and we can remove the code for discarding and re-reading it. There are two paths to update_index_refresh() from cmd_reset(), but on both paths,

[PATCH 00/19] reset improvements

2013-01-09 Thread Martin von Zweigbergk
This is kind of a re-roll of [1] (wow, apparently it took me almost two months to get done). The goal was, then and now, to teach git reset to work on an unborn branch and to not require a commit when a tree would do. This time, I also made some tangential improvements along the way, mostly

[PATCH 17/19] reset $sha1 $pathspec: require $sha1 only to be treeish

2013-01-09 Thread Martin von Zweigbergk
Resetting with paths does not update HEAD and there is nothing else that a commit should be needed for. Relax the argument parsing so only a tree is required. The sha1 is only passed to read_from_tree(), which already only requires a tree. The rev variable we pass to run_add_interactive() will

[PATCH 08/19] reset.c: share call to die_if_unmerged_cache()

2013-01-09 Thread Martin von Zweigbergk
Use a single condition to guard the call to die_if_unmerged_cache for both --soft and --keep. This avoids the small distraction of the precondition check from the logic following it. Also change an instance of if (e) err = err || f(); to the almost as short, but clearer if (e !err)

[PATCH 16/19] reset [--mixed] --quiet: don't refresh index

2013-01-09 Thread Martin von Zweigbergk
git reset [--mixed] without --quiet refreshes the index in order to display the Unstaged changes after reset. When --quiet is given, that output is suppressed, removing the need to refresh the index. Other porcelain commands that care about a refreshed index should already be refreshing it, so

[PATCH 07/19] reset.c: extract function for updating {ORIG,}HEAD

2013-01-09 Thread Martin von Zweigbergk
By extracting the code for updating the HEAD and ORIG_HEAD symbolic references to a separate function, we declutter cmd_reset() a bit and we make it clear that e.g. the four variables {,sha1_}{,old_}orig are only used by this code. --- builtin/reset.c | 39 +++

[PATCH 06/19] reset.c: remove unnecessary variable 'i'

2013-01-09 Thread Martin von Zweigbergk
Throughout most of parse_args(), the variable 'i' remains at 0. In the remaining few cases, we can do pointer arithmentic on argv itself instead. --- This is clearly mostly a matter of taste. The remainder of the series does not depend on it in any way. builtin/reset.c | 29

[PATCH 03/19] reset.c: pass pathspec around instead of (prefix, argv) pair

2013-01-09 Thread Martin von Zweigbergk
We use the path arguments in two places in reset.c: in interactive_reset() and read_from_tree(). Both of these call get_pathspec(), so we pass the (prefix, arv) pair to both functions. Move the call to get_pathspec() out of these methods, for two reasons: 1) One argument is simpler than two. 2) It

[PATCH 11/19] reset: avoid redundant error message

2013-01-09 Thread Martin von Zweigbergk
If writing or committing the new index file fails, we print Could not write new index file. followed by Could not reset index file to revision $rev.. The first message seems to imply the second, so print only the first message. --- builtin/reset.c | 8 +++- 1 file changed, 3 insertions(+), 5

[PATCH 18/19] reset: allow reset on unborn branch

2013-01-09 Thread Martin von Zweigbergk
Some users seem to think, knowingly or not, that being on an unborn branch is like having a commit with an empty tree checked out, but when run on an unborn branch, git reset currently fails with: fatal: Failed to resolve 'HEAD' as a valid ref. Instead of making users figure out that they

[PATCH 12/19] reset.c: move update_index_refresh() call out of read_from_tree()

2013-01-09 Thread Martin von Zweigbergk
The final part of cmd_reset() essentially looks like: if (pathspec) { ... read_from_tree(...); } else { ... reset_index(...); update_index_refresh(...); ... } where read_from_tree() internally also calls update_index_refresh(). Move the call to

Re: [PATCH] commit: make default of cleanup option configurable

2013-01-09 Thread Jonathan Nieder
Ralf Thielow wrote: It's actually my own usecase :). The bugtracker I'm using is able to create relationships between issues and related commits. It expects that a part of the commit message contains the issue number in format #issueId. So I need to use a cleanup mode different from default

Re: Proposal for git stash rename

2013-01-09 Thread Michael Haggerty
On 01/04/2013 10:40 PM, Junio C Hamano wrote: Micheil Smith mich...@brandedcode.com writes: This patch implements a git stash rename using a new git reflog update command that updates the message associated with a reflog entry. ... I note that this proposal is now two years old. A work in

Deutsch-Händler Online-Thomas Sabo

2013-01-09 Thread flexma
Thomas Sabo Charms http://www.schmuckkaufen.eu/ spielt eine wichtige Rolle in der Definition von Stil und brilliant. Kein Mädchen oder eine Frau auf Erden, die nicht bewegt wird mit dem Stil der Schmuck fasziniert . Obwohl die Mädchen sind verrückt tragen spannende und verschiedene Methoden

Re: [PATCH 03/19] reset.c: pass pathspec around instead of (prefix, argv) pair

2013-01-09 Thread Matt Kraai
On Wed, Jan 09, 2013 at 12:16:00AM -0800, Martin von Zweigbergk wrote: We use the path arguments in two places in reset.c: in interactive_reset() and read_from_tree(). Both of these call get_pathspec(), so we pass the (prefix, arv) pair to both ^^^ argv

Re: [PATCH 07/19] reset.c: extract function for updating {ORIG,}HEAD

2013-01-09 Thread Matt Kraai
In the summary, {ORIG,} should be {ORIG_,}. -- Matt -- 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

Failure and unhelpful error message from 'rebase --preserve-merges'

2013-01-09 Thread Phil Hord
Since 90e1818f9a (git-rebase: add keep_empty flag, 2012-04-20) 'git rebase --preserve-merges' fails in a case where it used to succeed, and it does so with an unhelpful error message. $ git rebase --preserve-merges master error: Commit 452524... is a merge but no -m option was given.

Re: On --depth=funny value

2013-01-09 Thread Duy Nguyen
On Wed, Jan 9, 2013 at 12:19 PM, Junio C Hamano gits...@pobox.com wrote: Duy Nguyen pclo...@gmail.com writes: On Wed, Jan 9, 2013 at 9:53 AM, Junio C Hamano gits...@pobox.com wrote: ... * We would like to update clone --depth=1 to end up with a tip only repository, but let's not to touch

Re: On --depth=funny value

2013-01-09 Thread Duy Nguyen
On Wed, Jan 9, 2013 at 9:53 AM, Junio C Hamano gits...@pobox.com wrote: * Make git fetch and git clone die() when zero or negative number is given with --depth=$N, for the following reasons: ... For Stefan when you update the patch. If git fetch --depth=0 is considered invalid too as

Re: Fwd: git-gui / Warning: No newline at end of file”

2013-01-09 Thread Pat Thoyts
Junio C Hamano gits...@pobox.com writes: Tobias Preuss tobias.pre...@googlemail.com writes: Hello. I never got a response. Did my email pass the distribution list? Best, Tobias Pat? I did have a brief look at this but I don't have a solution at the moment. The \ No newline at end of file is

Re: [PATCH] commit: make default of cleanup option configurable

2013-01-09 Thread Junio C Hamano
Ralf Thielow ralf.thie...@gmail.com writes: When a user uses a script/importer which expects that the default option is used without setting it explicitly, and then the user changes the default, isn't it the users fault if that would break things? Not necessarily. There are many people who

Re: git branch case insensitivity (Possible bug)

2013-01-09 Thread Andreas Ericsson
On 01/09/2013 04:46 PM, Alexander Gallego wrote: Hello, Here is a pastebin where I've reproduced the steps on a clean git repo. http://pastebin.com/0vQZEat0 Brief description of the problem: 1.Basically one creates a local branch call it 'imp_fix' (branch off master -- this

Re: [PATCH] commit: make default of cleanup option configurable

2013-01-09 Thread Junio C Hamano
Ralf Thielow ralf.thie...@gmail.com writes: It's actually my own usecase :). The bugtracker I'm using is able to create relationships between issues and related commits. It expects that a part of the commit message contains the issue number in format #issueId. So I need to use a cleanup mode

git interaction between push and auto-gc

2013-01-09 Thread Bob Lavey
Greetings, We are seeing some unexpected behavior with git that we'd like to better understand. We are running git 1.7.11.1 on the remote repo server (CentOS 6.3-x86) and the clients (mostly Windows 7), and we are running gitolite 3.04 on the server. At times, our repos can get many

Re: Please pull l10n updates

2013-01-09 Thread Junio C Hamano
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 http://vger.kernel.org/majordomo-info.html

Re: [PATCH 16/19] reset [--mixed] --quiet: don't refresh index

2013-01-09 Thread Jeff King
On Wed, Jan 09, 2013 at 12:16:13AM -0800, Martin von Zweigbergk wrote: git reset [--mixed] without --quiet refreshes the index in order to display the Unstaged changes after reset. When --quiet is given, that output is suppressed, removing the need to refresh the index. Other porcelain

Re: git branch case insensitivity (Possible bug)

2013-01-09 Thread Alexander Gallego
On Wed, Jan 9, 2013 at 10:52 AM, Andreas Ericsson a...@op5.se wrote: On 01/09/2013 04:46 PM, Alexander Gallego wrote: Hello, Here is a pastebin where I've reproduced the steps on a clean git repo. http://pastebin.com/0vQZEat0 Brief description of the problem: 1.Basically one creates

Re: Enabling scissors by default?

2013-01-09 Thread Jeff King
On Tue, Jan 08, 2013 at 03:36:09PM -0800, Junio C Hamano wrote: You could introduce a new configuration variable am.scissors and personally turn it on, though. Setting that variable *does* count as the user explicitly asking for it. I think we have mailinfo.scissors already. I often see

Re: [PATCH v2 03/10] mailmap: remove email copy and length limitation

2013-01-09 Thread Antoine Pelisse
+static struct string_list_item *lookup_prefix(struct string_list *map, + const char *string, size_t len) +{ + int i = string_list_find_insert_index(map, string, 1); + if (i 0) { + /* exact match */ + i =

Re: Enabling scissors by default?

2013-01-09 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Jan 08, 2013 at 03:36:09PM -0800, Junio C Hamano wrote: You could introduce a new configuration variable am.scissors and personally turn it on, though. Setting that variable *does* count as the user explicitly asking for it. I think we have

Re: [PATCH v2 03/10] mailmap: remove email copy and length limitation

2013-01-09 Thread Junio C Hamano
Antoine Pelisse apeli...@gmail.com writes: +static struct string_list_item *lookup_prefix(struct string_list *map, + const char *string, size_t len) +{ + int i = string_list_find_insert_index(map, string, 1); + if (i 0) { +

Re: git branch case insensitivity (Possible bug)

2013-01-09 Thread Joshua Jensen
- Original Message - From: Andreas Ericsson Date: 1/9/2013 8:52 AM Are you using Mac OSX? Are you using the HFS+ filesystem shipped with it? Did you use the filesystem's default settings rather than reinstall your system with sensible settings? If you said yes to all of the above, this

Re: [PATCH v2 03/10] mailmap: remove email copy and length limitation

2013-01-09 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Antoine Pelisse apeli...@gmail.com writes: +static struct string_list_item *lookup_prefix(struct string_list *map, + const char *string, size_t len) +{ + int i = string_list_find_insert_index(map,

Re: git branch case insensitivity (Possible bug)

2013-01-09 Thread Johannes Sixt
Am 09.01.2013 18:03, schrieb Alexander Gallego: On Wed, Jan 9, 2013 at 10:52 AM, Andreas Ericsson a...@op5.se wrote: [about case-insensitivity of HFS+ and branch names] If you said yes to all of the above, this is a filesystem feature, courtesy of (cr)Apple, and you're screwed. You can work

t7400 broken on pu (Mac OS X)

2013-01-09 Thread Torsten Bögershausen
The current pu fails on Mac OS, case insensitive FS. Bisecting points out commit 3f28e4fafc046284657945798d71c57608bee479 [snip] Date: Sun Jan 6 13:21:07 2013 +0700 Convert add_files_to_cache to take struct pathspec And I veryfied that the preceeding commit 05647d2d8a5dc456d1f4ef73 is

Re: [PATCH 16/19] reset [--mixed] --quiet: don't refresh index

2013-01-09 Thread Martin von Zweigbergk
On Wed, Jan 9, 2013 at 9:01 AM, Jeff King p...@peff.net wrote: On Wed, Jan 09, 2013 at 12:16:13AM -0800, Martin von Zweigbergk wrote: git reset [--mixed] without --quiet refreshes the index in order to display the Unstaged changes after reset. When --quiet is given, that output is suppressed,

Re: t7400 broken on pu (Mac OS X)

2013-01-09 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: The current pu fails on Mac OS, case insensitive FS. Bisecting points out commit 3f28e4fafc046284657945798d71c57608bee479 [snip] Date: Sun Jan 6 13:21:07 2013 +0700 Next time do not [snip] but please find the author address there, and Cc such a

git-completion.tcsh and git-completion.zsh are broken?

2013-01-09 Thread Manlio Perillo
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi. I have finally resolved all the problems with my path completion in git-completion.bash and, in order to avoid regressions, I'm checking the git-completion.zsh and git-completion.tcsh scripts, since they use the bash completion support. I have

Re: [PATCH 03/19] reset.c: pass pathspec around instead of (prefix, argv) pair

2013-01-09 Thread Junio C Hamano
Martin von Zweigbergk martinv...@gmail.com writes: We use the path arguments in two places in reset.c: in interactive_reset() and read_from_tree(). Both of these call get_pathspec(), so we pass the (prefix, arv) pair to both functions. Move the call to get_pathspec() out of these methods, for

Re: [PATCH 04/19] reset: don't allow git reset -- $pathspec in bare repo

2013-01-09 Thread Junio C Hamano
Martin von Zweigbergk martinv...@gmail.com writes: --- builtin/reset.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) With the patch that does not have any explicit check for bareness nor new error message to scold user with, it is rather hard to tell what is going on, without

[PATCHv2] commit: make default of cleanup option configurable

2013-01-09 Thread Ralf Thielow
The default of the cleanup option in git commit is not configurable. Users who don't want to use the default have to pass this option on every commit since there's no way to configure it. This commit introduces a new config option commit.cleanup which can be used to change the default of the

Re: [PATCH 16/19] reset [--mixed] --quiet: don't refresh index

2013-01-09 Thread Martin von Zweigbergk
On Wed, Jan 9, 2013 at 11:12 AM, Junio C Hamano gits...@pobox.com wrote: Martin von Zweigbergk martinv...@gmail.com writes: And as a Porcelain, I would rather expect it to leave the resulting index refreshed. Yeah, I guess you're right. Regular users (those using only porcelain) shouldn't

Re: [PATCH 06/19] reset.c: remove unnecessary variable 'i'

2013-01-09 Thread Junio C Hamano
Martin von Zweigbergk martinv...@gmail.com writes: Throughout most of parse_args(), the variable 'i' remains at 0. In the remaining few cases, we can do pointer arithmentic on argv itself instead. --- This is clearly mostly a matter of taste. The remainder of the series does not depend on

[PATCH] remote-hg: store converted URL

2013-01-09 Thread Max Horn
From: Felipe Contreras felipe.contre...@gmail.com Mercurial might convert the URL to something more appropriate, like an absolute path. Lets store that instead of the original URL, which won't work from a different working directory if it's relative. Suggested-by: Max Horn m...@quendi.de

Re: [PATCH 08/19] reset.c: share call to die_if_unmerged_cache()

2013-01-09 Thread Junio C Hamano
Martin von Zweigbergk martinv...@gmail.com writes: Use a single condition to guard the call to die_if_unmerged_cache for both --soft and --keep. This avoids the small distraction of the precondition check from the logic following it. Also change an instance of if (e) err = err ||

[PATCH v2 1/2] git-fast-import(1): combine documentation of --[no-]relative-marks

2013-01-09 Thread John Keeping
The descriptions of '--relative-marks' and '--no-relative-marks' make more sense when read together instead of as two independent options. Combine them into a single description block. Signed-off-by: John Keeping j...@keeping.me.uk --- Documentation/git-fast-import.txt | 10 -- 1 file

[PATCH v2 0/2] Reorganise options in git-fast-import(1)

2013-01-09 Thread John Keeping
Here's a second attempt at this taking into account the feedback received so far. Changes since v1: * Left dedup '--done' as a separate patch (now merged) * Split combining '--[no-]relative-marks' into a separate patch * '--force' moved to the top of the options, making the catchall

Re: [PATCH 09/19] reset.c: replace switch by if-else

2013-01-09 Thread Junio C Hamano
Martin von Zweigbergk martinv...@gmail.com writes: --- builtin/reset.c | 13 +++-- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/builtin/reset.c b/builtin/reset.c index 42d1563..05ccfd4 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -351,18 +351,11 @@ int

git-archive fails against smart-http repos

2013-01-09 Thread Bruce Lysik
Hi, Trying to run git-archive fails against smart-http based repos. Example: $ git archive --verbose --format=zip --remote=http://code.toofishes.net/git/dan/initscripts.git fatal: Operation not supported by protocol. Unexpected end of command stream This problem was brought up against my

[PATCH v2 2/2] git-fast-import(1): reorganise options

2013-01-09 Thread John Keeping
The options in git-fast-import(1) are not currently arranged in a logical order, which has caused the '--done' options to be documented twice (commit 3266de10). Rearrange them into logical groups under subheadings. Suggested-by: Jonathan Nieder jrnie...@gmail.com Signed-off-by: John Keeping

Re: [PATCH 10/19] reset --keep: only write index file once

2013-01-09 Thread Junio C Hamano
Martin von Zweigbergk martinv...@gmail.com writes: git reset --keep calls reset_index_file() twice, first doing a two-way merge to the target revision, updating the index and worktree, and then resetting the index. After each call, we write the index file. In the unlikely event that the

Re: [PATCH 15/19] reset.c: finish entire cmd_reset() whether or not pathspec is given

2013-01-09 Thread Junio C Hamano
Martin von Zweigbergk martinv...@gmail.com writes: By not returning from inside the if (pathspec) block, we can let the pathspec-aware and pathspec-less code share a bit more, making it easier to make future changes that should affect both cases. This also highlights the similarity between

Re: [PATCH 16/19] reset [--mixed] --quiet: don't refresh index

2013-01-09 Thread Junio C Hamano
Martin von Zweigbergk martinv...@gmail.com writes: There is a test case in t7102 called '--mixed refreshes the index', but it only checks that right output it printed. I think that comes from 620a6cd (builtin-reset: avoid forking update-index --refresh, 2007-11-03). Before that commit, we

[PATCH] git-shortlog(1): document behaviour of zero-width wrap

2013-01-09 Thread John Keeping
Commit 00d3947 (Teach --wrap to only indent without wrapping) added special behaviour for a width of zero in the '-w' argument to 'git-shortlog' but this was not documented. Fix this. Signed-off-by: John Keeping j...@keeping.me.uk --- Documentation/git-shortlog.txt | 3 +++ 1 file changed, 3

RE: git-completion.tcsh and git-completion.zsh are broken?

2013-01-09 Thread Marc Khouzam
-Original Message- From: git-ow...@vger.kernel.org [mailto:git-ow...@vger.kernel.org] On Behalf Of Manlio Perillo Sent: Wednesday, January 09, 2013 2:17 PM To: git@vger.kernel.org Subject: git-completion.tcsh and git-completion.zsh are broken? -BEGIN PGP SIGNED MESSAGE-

Re: [PATCH 17/19] reset $sha1 $pathspec: require $sha1 only to be treeish

2013-01-09 Thread Junio C Hamano
Martin von Zweigbergk martinv...@gmail.com writes: Resetting with paths does not update HEAD and there is nothing else that a commit should be needed for. Relax the argument parsing so only a tree is required. The sha1 is only passed to read_from_tree(), which already only requires a tree.

Re: [PATCH 19/19] reset [--mixed]: use diff-based reset whether or not pathspec was given

2013-01-09 Thread Junio C Hamano
Martin von Zweigbergk martinv...@gmail.com writes: Thanks to b65982b (Optimize diff-index --cached using cache-tree, 2009-05-20), resetting with paths is much faster than resetting without paths. Some timings for the linux-2.6 repo to illustrate this (best of five, warm cache):

Re: [RFC/PATCH] avoid SIGPIPE warnings for aliases

2013-01-09 Thread Junio C Hamano
Jeff King p...@peff.net writes: When git executes an alias that specifies an external command, it will complain if the alias dies due to a signal. This is usually a good thing, as signal deaths are unexpected. However, SIGPIPE is not unexpected for many commands which produce a lot of

Re: [RFC/PATCH] avoid SIGPIPE warnings for aliases

2013-01-09 Thread Jeff King
On Wed, Jan 09, 2013 at 12:48:20PM -0800, Junio C Hamano wrote: $ git lg -p [user hits 'q' to exit pager] error: git lgbase --more-options died of signal 13 fatal: While expanding alias 'lg': 'git lgbase --more-options': Success Many users won't see this, because we execute

Re: git-completion.tcsh and git-completion.zsh are broken?

2013-01-09 Thread Manlio Perillo
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 09/01/2013 21:21, Marc Khouzam ha scritto: [...] $zsh synapsis% source contrib/completion/git-completion.zsh (anon):6: command not found: ___main _git:11: command not found: _default I have disabled compinit autoload (since, I don't know

What's cooking in git.git (Jan 2013, #04; Wed, 9)

2013-01-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'. So far, about 60 topics, most of which have been cooking since the previous cycle, have been graduated to the 'master' branch in preparation

Re: GIT get corrupted on lustre

2013-01-09 Thread Eric Chamberland
Hi Brian, On 01/08/2013 11:11 AM, Eric Chamberland wrote: On 12/24/2012 10:11 AM, Brian J. Murrell wrote: Have you tried adding a -q to the git command line to quiet down git's feedback messages? I moved to git 1.8.1 and added the -q to the command git gc but it occured to return an

Re: On --depth=funny value

2013-01-09 Thread Stefan Beller
On 01/09/2013 03:53 AM, Junio C Hamano wrote: Can people sanity check the reasoning outlined here? Anything I missed? The above outline identifies three concrete tasks that different people can tackle more or less independently, each with updated code, documentation and test: 1. git

Re: [PATCH v2 1/2] git-fast-import(1): combine documentation of --[no-]relative-marks

2013-01-09 Thread Jonathan Nieder
John Keeping wrote: The descriptions of '--relative-marks' and '--no-relative-marks' make more sense when read together instead of as two independent options. Combine them into a single description block. Yep, this is easier to read. Thanks. Reviewed-by: Jonathan Nieder jrnie...@gmail.com

Re: [RFC/PATCH] avoid SIGPIPE warnings for aliases

2013-01-09 Thread Junio C Hamano
Jeff King p...@peff.net writes: But we still say error: ... died of signal 13, because that comes from inside wait_or_whine. So it is a separate issue whether or not wait_or_whine should be silent on SIGPIPE (we already are on SIGINT and SIGQUIT, as of some recent patches). The upside is

Re: [PATCH v2 2/2] git-fast-import(1): reorganise options

2013-01-09 Thread Junio C Hamano
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 http://vger.kernel.org/majordomo-info.html

[PATCH] t0008: avoid brace expansion

2013-01-09 Thread René Scharfe
Brace expansion is not required by POSIX and not supported by dash nor NetBSD's sh. Explicitly list all combinations instead. Signed-off-by: Rene Scharfe rene.scha...@lsrfire.ath.cx --- t/t0008-ignores.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git

Re: [PATCH] t0008: avoid brace expansion

2013-01-09 Thread Adam Spiers
On Wed, Jan 9, 2013 at 11:49 PM, René Scharfe rene.scha...@lsrfire.ath.cx wrote: Brace expansion is not required by POSIX and not supported by dash nor NetBSD's sh. Explicitly list all combinations instead. Good catch, thanks! -- To unsubscribe from this list: send the line unsubscribe git in

Re: [PATCHv2] commit: make default of cleanup option configurable

2013-01-09 Thread Junio C Hamano
Ralf Thielow ralf.thie...@gmail.com writes: The default of the cleanup option in git commit is not configurable. Users who don't want to use the default have to pass this option on every commit since there's no way to configure it. This commit introduces a new config option commit.cleanup

Re: [PATCH] t0008: avoid brace expansion

2013-01-09 Thread Junio C Hamano
Adam Spiers g...@adamspiers.org writes: On Wed, Jan 9, 2013 at 11:49 PM, René Scharfe rene.scha...@lsrfire.ath.cx wrote: Brace expansion is not required by POSIX and not supported by dash nor NetBSD's sh. Explicitly list all combinations instead. Good catch, thanks! Yeah; thanks. It

Re: [RFC/PATCH] avoid SIGPIPE warnings for aliases

2013-01-09 Thread Jonathan Nieder
Junio C Hamano wrote: Jeff King p...@peff.net writes: But we still say error: ... died of signal 13, because that comes from inside wait_or_whine. So it is a separate issue whether or not wait_or_whine should be silent on SIGPIPE (we already are on SIGINT and SIGQUIT, as of some recent

Re: [PATCH] t0008: avoid brace expansion

2013-01-09 Thread Adam Spiers
On Thu, Jan 10, 2013 at 12:18 AM, Junio C Hamano gits...@pobox.com wrote: Adam Spiers g...@adamspiers.org writes: On Wed, Jan 9, 2013 at 11:49 PM, René Scharfe rene.scha...@lsrfire.ath.cx wrote: Brace expansion is not required by POSIX and not supported by dash nor NetBSD's sh. Explicitly

Re: [RFC/PATCH] avoid SIGPIPE warnings for aliases

2013-01-09 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: I'm not sure whether there are SIGPIPE instances we really don't want to be silent about, though. I suspect not. ;-) Compare http://thread.gmane.org/gmane.comp.version-control.git/2062,

Re: [PATCH v4] git-clean: Display more accurate delete messages

2013-01-09 Thread Zoltan Klinger
I wonder whether it's possible to make the output more consistent, as in: Removing tracked_dir/some_untracked_file Removing untracked_file Skipping repository untracked_foo/frotz.git Removing untracked_foo/bar Removing untracked_foo/emptydir Skipping repository

Re: [PATCH v4] git-clean: Display more accurate delete messages

2013-01-09 Thread Junio C Hamano
Zoltan Klinger zoltan.klin...@gmail.com writes: Consider the output of the improved version: $ git clean -fd Removing tracked_dir/some_untracked_file Removing untracked_file warning: ignoring untracked git repository untracked_foo/frotz.git Removing untracked_foo/bar Removing

links of london sale have always endeavoured to create

2013-01-09 Thread jillysee
For someone looking for a classic fashion look, you might consider a strong links of london sale http://www.linksoflondonbraceletsweetie.co.uk/ /strong or gems to go with a formal suit. A row of small diamonds set in white gold or silver really brings out the spark, and not clearly defined and

thomas sabo bracelet technology which offers all the college

2013-01-09 Thread jiuzheyab
Thomas Sabo is a popular name in the field of sterling silver jewelry. Modern youth have fallen in love with exclusive designs of strong thomas sabo uk http://www.thomassabobraceletsshop.co.uk/ /strong. Nowadays, one can easily spot people wearing different products (like bracelets, earrings, and

selection of links of london friendship bracelet is extraordinary

2013-01-09 Thread liseera521
Silver charm bracelet natural Spar chain in the bottom half, dark green pole with dirt, very natural, unaffected. Interval adding green metallic beads and silver flower belt also left-right asymmetry of the links of london sale is hot in recent years, the irregular wind. You will be able to do

Re: t7400 broken on pu (Mac OS X)

2013-01-09 Thread Duy Nguyen
On Wed, Jan 09, 2013 at 07:43:03PM +0100, Torsten Bögershausen wrote: The current pu fails on Mac OS, case insensitive FS. Bisecting points out commit 3f28e4fafc046284657945798d71c57608bee479 [snip] Date: Sun Jan 6 13:21:07 2013 +0700 Convert add_files_to_cache to take struct

people seem to return pandora bracelets to those ancient times

2013-01-09 Thread qitade655
pandora bracelets brand launched several carefully crafted pendant. Most of people inclined to judge people by their dressing, and measure their status and ability, to decide the attitude. The researcher found that there were only twelve people of the dressing lower class style get the profile,

pandora bracelets but by the time it has charms

2013-01-09 Thread zhangqy1
Every now and then some new trend in fashion or jewelry comes along, makes an enormous splash, [url=http://www.pandoraclub.org/]pandora bracelets[/url] has carried out just that. It appears like everybody's talking about it now. Purchasing, collecting, and adding on to their necklaces and

Re: [PATCH 4/4] t5002: check if unzip supports symlinks

2013-01-09 Thread Jonathan Nieder
René Scharfe wrote: Am 07.01.2013 09:52, schrieb Jonathan Nieder: Hm. Do some implementations of unzip not support symlinks, or is the problem that some systems build Info-ZIP without the SYMLINKS option? The unzip supplied with NetBSD 6.0.1, which is based on libarchive, doesn't support