Re: [PATCH 5/6] status: do not depend on flaky reflog messages

2013-06-14 Thread Ramkumar Ramachandra
Junio C Hamano wrote: What is wrong with git describe? Is this cheaper, or am I missing something? I think what you are missing is that the detached from is not about your current HEAD after you flipped it around with many resets and commits. It is about what tag or what specific commit you

Re: [PATCH 4/4] resolve_ref_unsafe(): close race condition reading loose refs

2013-06-14 Thread Michael Haggerty
On 06/13/2013 10:22 AM, Thomas Rast wrote: Michael Haggerty mhag...@alum.mit.edu writes: One race is still possible and undetected: another process could change the file from a regular file into a symlink between the call to lstat and the call to open(). The open() call would silently

[PATCH 1/2] am: handle stray $dotest directory

2013-06-14 Thread Ramkumar Ramachandra
The following bug has been observed: $ git am # no input file ^C $ git am --abort Resolve operation not in progress, we are not resuming. This happens because the following test fails: test -d $dotest test -f $dotest/last test -f $dotest/next and the codepath for an am in-progress

[PATCH v2 0/2] Fix am with stray $dotest directory

2013-06-14 Thread Ramkumar Ramachandra
[1/2] is now equipped to handle any am invocation in the presence of a stray $dotest directory. [2/2] is a while we're there. Thanks. Ramkumar Ramachandra (2): am: handle stray $dotest directory t/am: use test_path_is_missing() where appropriate git-am.sh | 14 ++

[PATCH 2/2] t/am: use test_path_is_missing() where appropriate

2013-06-14 Thread Ramkumar Ramachandra
Replace instances of ! test -d with test_path_is_missing. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- t/t4150-am.sh | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/t/t4150-am.sh b/t/t4150-am.sh index 6c2cc3e..5edb79a 100755

[PATCH v2] prompt: squelch error output from cat

2013-06-14 Thread Ramkumar Ramachandra
The files $g/rebase-{merge,apply}/{head-name,msgnum,end} are not guaranteed to exist. When attempting to cat them, squelch the error output. In addition to guarding against stray directories, this patch addresses a real problem: # on terminal 1 $ git rebase -i master # ignore editor, and

Re: git stash while pending merge should not be allowed

2013-06-14 Thread John Keeping
On Fri, Jun 07, 2013 at 11:47:07AM -0700, Junio C Hamano wrote: Scott McPeak smcp...@coverity.com writes: I suggest that this problem could easily have been avoided if git stash refused to run with a pending merge (present MERGE_HEAD file), since this is crucial repository state that it

[PATCH 0/2] Rebasing pull with autostash

2013-06-14 Thread Ramkumar Ramachandra
It's trivial to support the feature :) Ramkumar Ramachandra (2): pull: respect rebase.autostash pull: clarify the large { ... } form git-pull.sh | 7 +-- t/t5520-pull.sh | 11 +++ 2 files changed, 16 insertions(+), 2 deletions(-) -- 1.8.3.1.379.gb74074e.dirty -- To

[PATCH 1/2] pull: respect rebase.autostash

2013-06-14 Thread Ramkumar Ramachandra
If a rebasing pull is requested, pull unconditionally runs require_clean_worktree() resulting in: # dirty worktree or index $ git pull Cannot pull with rebase: Your index contains uncommitted changes. Please commit or stash them. It does this to inform the user early on that a rebase

[PATCH 2/2] pull: clarify the large { ... } form

2013-06-14 Thread Ramkumar Ramachandra
Remove the large { ... } form, as the block can be confused with a function block. Use a simple if-condition instead. No functional changes. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- git-pull.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git

Re: [PATCH 2/2] pull: clarify the large { ... } form

2013-06-14 Thread Matthieu Moy
Ramkumar Ramachandra artag...@gmail.com writes: -test true = $rebase { +if test true = $rebase; then Use a newline, not a ';'. See CodingGuideLines: - Do not write control structures on a single line with semicolon. then should be on the next line for if statements, and do should be

Re: [PATCH 1/2] pull: respect rebase.autostash

2013-06-14 Thread Matthieu Moy
Ramkumar Ramachandra artag...@gmail.com writes: --- a/git-pull.sh +++ b/git-pull.sh @@ -44,6 +44,7 @@ merge_args= edit= curr_branch=$(git symbolic-ref -q HEAD) curr_branch_short=${curr_branch#refs/heads/} rebase=$(git config --bool branch.$curr_branch_short.rebase) +autostash=$(git

Re: [PATCH] Documentation/CommunityGuidelines

2013-06-14 Thread Christian Couder
Hi, On Thu, Jun 13, 2013 at 12:19 PM, Thomas Adam tho...@xteddy.org wrote: So these guidelines gain the community nothing, and only serve to punish those who are already following them, without them being written down, because the root-cause of the problem is still here, and isn't going to go

[PATCH V2] git-remote-mediawiki: remove hardcoded version number in the test suite

2013-06-14 Thread benoit . person
From: Benoit Person benoit.per...@ensimag.fr Updates the code to make it more easy to switch mediawiki version when testing. Before that, the version number was partly hardcoded, partly in a var. Signed-off-by: Benoit Person benoit.per...@ensimag.fr Signed-off-by: Matthieu Moy

[PATCH v2 0/5] Write a good 'git stash store' for autostash

2013-06-14 Thread Ramkumar Ramachandra
Hi, So, I've taken Junio's suggestion and designed a proper command-line interface for 'git stash store' in this iteration: git stash store [-m message] [-e error] commit The error string will be passed through eval_gettext before it is printed. Otherwise, the idea is the same: to clean up

[PATCH 1/5] stash doc: add a warning about using create

2013-06-14 Thread Ramkumar Ramachandra
Add a note saying that the user probably wants save in the create description. While at it, document that it can optionally take a message in the synopsis. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- Documentation/git-stash.txt | 3 ++- 1 file changed, 2 insertions(+), 1

[PATCH 5/5] rebase: use 'git stash store' to simplify logic

2013-06-14 Thread Ramkumar Ramachandra
rebase has no reason to know about the implementation of the stash. In the case when applying the autostash results in conflicts, replace the relevant code in finish_rebase () to simply call 'git stash store'. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- git-rebase.sh | 6 +-

[PATCH 4/5] stash: introduce 'git stash store'

2013-06-14 Thread Ramkumar Ramachandra
save_stash() contains the logic for doing two potentially independent operations; the first is preparing the stash merge commit, and the second is updating the stash ref/ reflog accordingly. While the first operation is abstracted out into a create_stash() for callers to access via 'git stash

[PATCH 3/5] stash: simplify option parser for create

2013-06-14 Thread Ramkumar Ramachandra
The option parser for create unnecessarily checks $1 inside a case statement that matches $1 in the first place. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- git-stash.sh | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/git-stash.sh b/git-stash.sh index

Re: [PATCH 1/2] pull: respect rebase.autostash

2013-06-14 Thread Ramkumar Ramachandra
Matthieu Moy wrote: It would be nice to have an --autostash command-line option too, I thought it would be a bit ugly, since it's already overloaded with options to pass to merge. and the error message in require_clean_work_tree could suggest using it. That would make the feature easily

Re: [PATCH 2/2] pull: clarify the large { ... } form

2013-06-14 Thread Ramkumar Ramachandra
Matthieu Moy wrote: Use a newline, not a ';'. 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: is there a fast web-interface to git for huge repos?

2013-06-14 Thread Holger Hellmuth (IKS)
Am 07.06.2013 22:21, schrieb Constantine A. Murenin: I'm totally fine with daily updates; but I think there still has to be some better way of doing this than wasting 0.5s of CPU time and 5s of HDD time (if completely cold) for each blame / log, at the price of more storage and some pre-caching,

Re: [PATCH 1/2] pull: respect rebase.autostash

2013-06-14 Thread Phil Hord
On Fri, Jun 14, 2013 at 6:41 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Matthieu Moy wrote: It would be nice to have an --autostash command-line option too, I thought it would be a bit ugly, since it's already overloaded with options to pass to merge. Eventually I think a switch will

Re: [PATCH 1/2] pull: respect rebase.autostash

2013-06-14 Thread Phil Hord
On Fri, Jun 14, 2013 at 4:56 AM, Ramkumar Ramachandra artag...@gmail.com wrote: If a rebasing pull is requested, pull unconditionally runs require_clean_worktree() resulting in: # dirty worktree or index $ git pull Cannot pull with rebase: Your index contains uncommitted changes.

Re: [PATCH 1/2] pull: respect rebase.autostash

2013-06-14 Thread Phil Hord
On Fri, Jun 14, 2013 at 8:12 AM, Phil Hord phil.h...@gmail.com wrote: On Fri, Jun 14, 2013 at 4:56 AM, Ramkumar Ramachandra artag...@gmail.com wrote: If a rebasing pull is requested, pull unconditionally runs require_clean_worktree() resulting in: # dirty worktree or index $ git pull

Re: [PATCH 1/5] stash doc: add a warning about using create

2013-06-14 Thread Phil Hord
On Fri, Jun 14, 2013 at 6:32 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Add a note saying that the user probably wants save in the create description. While at it, document that it can optionally take a message in the synopsis. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com

Re: [PATCH] format-patch: remove existing output-directory

2013-06-14 Thread John Keeping
On Fri, Jun 14, 2013 at 06:13:33PM +0530, Ramkumar Ramachandra wrote: The following command $ git format-patch -o outgoing master does not ensure that the output-directory outgoing doesn't already exist. As a result, it's possible for patches from two different series to get mixed up

Re: [PATCH] format-patch: remove existing output-directory

2013-06-14 Thread Fredrik Gustafsson
Hi, just some questions about your patch. On Fri, Jun 14, 2013 at 06:13:33PM +0530, Ramkumar Ramachandra wrote: The following command $ git format-patch -o outgoing master does not ensure that the output-directory outgoing doesn't already exist. As a result, it's possible for patches

Re: [PATCH] format-patch: remove existing output-directory

2013-06-14 Thread Ramkumar Ramachandra
John Keeping wrote: I don't think this is the correct behaviour. I can think of cases where I would want to output multiple things into the same directory. format.cleanOutputDirectory = true|false? -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

[PATCH 0/3] Get rebase to work with :/foomery committish

2013-06-14 Thread Ramkumar Ramachandra
Since the early preview, I realized that peel_committish() is required in exactly two places: the onto and upstream parsers facing end-user data. Updated appropriately. Thanks. Ramkumar Ramachandra (3): t/rebase: add failing tests for a peculiar revision sh-setup: add new peel_committish()

[PATCH 3/3] rebase: use peel_committish() where appropriate

2013-06-14 Thread Ramkumar Ramachandra
The revisions specified on the command-line as onto and upstream arguments could be of the form :/quuxery; so, use peel_committish() to resolve them. The failing tests in t/rebase and t/rebase-interactive now pass. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- git-rebase.sh

[PATCH 1/3] t/rebase: add failing tests for a peculiar revision

2013-06-14 Thread Ramkumar Ramachandra
The following commands fail, even if :/quuxery and :/foomery resolve to perfectly valid commits: $ git rebase [-i] --onto :/quuxery :/foomery This is because rebase [-i] attempts to rev-parse ${REV}^0 to verify that the given revision resolves to a commit. Add tests to document these

[PATCH 2/3] sh-setup: add new peel_committish() helper

2013-06-14 Thread Ramkumar Ramachandra
The normal way to check whether a certain revision resolves to a valid commit is: $ git rev-parse --verify $REV^0 Unfortunately, this does not work when $REV is of the type :/quuxery. Write a helper to work around this limitation. Suggested-by: Junio C Hamano gits...@pobox.com Signed-off-by:

Re: [PATCH] format-patch: remove existing output-directory

2013-06-14 Thread John Keeping
On Fri, Jun 14, 2013 at 06:45:19PM +0530, Ramkumar Ramachandra wrote: John Keeping wrote: I don't think this is the correct behaviour. I can think of cases where I would want to output multiple things into the same directory. format.cleanOutputDirectory = true|false? Maybe, but I was

Re: [PATCH] format-patch: remove existing output-directory

2013-06-14 Thread Ramkumar Ramachandra
Fredrik Gustafsson wrote: However I think this patch can improve the workflow for experienced developers. Can we tweak this in some way to get the best out of both worlds? The main problem is that output-directory can be an absolute path (like ~, in the extreme case). I'm not sure how to

Re: [PATCH 5/5] rebase: use 'git stash store' to simplify logic

2013-06-14 Thread Ramkumar Ramachandra
Phil Hord wrote: nit: adds a period where there was not one previously. Stripped periods in both, 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] format-patch: remove existing output-directory

2013-06-14 Thread Fredrik Gustafsson
On Fri, Jun 14, 2013 at 07:04:18PM +0530, Ramkumar Ramachandra wrote: Fredrik Gustafsson wrote: However I think this patch can improve the workflow for experienced developers. Can we tweak this in some way to get the best out of both worlds? The main problem is that output-directory can

Re: [PATCH] format-patch: remove existing output-directory

2013-06-14 Thread SZEDER Gábor
On Fri, Jun 14, 2013 at 07:04:18PM +0530, Ramkumar Ramachandra wrote: My main itch is that completion doesn't work with my fp: alias.fp = !rm -rf outgoing git format-patch -M -C -o outgoing Why not define your custom completion function for this alias in your .bashrc? _git_fp () {

[PATCH v6 00/31] git-remote-mediawiki: Follow perlcritic's recommandations

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr A new version of this series of patch, to make it mergeable with next. Changes with v5: - Fix a bug in [21/31] - Build on top of next so that it's mergeable Changes with v4: - fixed typos - Change in [21/31]: all the processing is done within the

[PATCH v6 01/31] git-remote-mediawiki: Make a regexp clearer

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr Perl's split function takes a regex pattern argument. You can also feed it an expression, which is then compiled into a regex at runtime. It therefore works to pass your pattern via single quotes, but it is much less obvious to a reader that the

[PATCH v6 06/31] git-remote-mediawiki: Change syntax of map calls

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr Put first parameter of map inside a block, for better readability. Follow BuiltinFunctions::RequireBlockMap Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr ---

[PATCH v6 05/31] git-remote-mediawiki: Move a variable declaration at the top of the code

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr %basetimestamps declaration was lost in the middle of subroutines Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr --- contrib/mw-to-git/git-remote-mediawiki.perl | 6 +++--- 1 file

[PATCH v6 04/31] git-remote-mediawiki: Always end a subroutine with a return

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr Follow Subroutines::RequireFinalReturn Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr --- contrib/mw-to-git/git-remote-mediawiki.perl | 18 ++ 1 file changed, 18

[PATCH v6 12/31] git-remote-mediawiki: Change style in a regexp

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr Change '[\n]' to '\n': brackets are useless here. Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr --- contrib/mw-to-git/git-remote-mediawiki.perl | 2 +- 1 file changed, 1

[PATCH v6 08/31] git-remote-mediawiki: Remove useless regexp modifier (m)

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr m// and // is used randomly. It is better to use the m modifier only when needed, e.g., when the regexp uses another separator than //. Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr

Re: [PATCH 5/6] status: do not depend on flaky reflog messages

2013-06-14 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: What is wrong with git describe? Is this cheaper, or am I missing something? I think what you are missing is that the detached from is not about your current HEAD after you flipped it around with many resets and

[PATCH v6 09/31] git-remote-mediawiki: Change the behaviour of a split

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr A split ' ' is turned into a split / /, which changes its behaviour: the old method matched a run of whitespaces (/\s*/), while the new one will match a single space, which is what we want here. Indeed, in other contexts, changing split(' ') to

[PATCH v6 07/31] git-remote-mediawiki: Rewrite unclear line of instructions

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr Subroutines' parameters should be assigned to variable before doing anything else Besides, existing instruction affected a variable inside a if, which break Git's coding style Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by:

[PATCH v6 14/31] git-remote-mediawiki: Change the name of a variable

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr Local variable $url has the same name as a global variable. Changing the name of the local variable prevents future possible misunderstanding. Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy

[PATCH v6 13/31] git-remote-mediawiki: Add newline in the end of die() error messages

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr --- contrib/mw-to-git/git-remote-mediawiki.perl | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff

[PATCH v6 27/31] git-remote-mediawiki: Fix a typo (mediwiki instead of mediawiki)

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr --- contrib/mw-to-git/git-remote-mediawiki.perl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

[PATCH v6 19/31] git-remote-mediawiki: Check return value of open

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr --- contrib/mw-to-git/git-remote-mediawiki.perl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git

[PATCH v6 26/31] git-remote-mediawiki: Put non-trivial numeric values in constants.

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr Non-trivial numeric values (e.g., different from 0, 1 and 2) are placed in constants at the top of the code to be easily modifiable and to make more sense Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy

[PATCH v6 24/31] git-remote-mediawiki: Replace unless statements with negated if statements

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr --- contrib/mw-to-git/git-remote-mediawiki.perl | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git

[PATCH v6 31/31] git-remote-mediawiki: Make error message more precise

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr In subroutine parse_command, error messages were not correct. For the import function, having too much or incorrect arguments displayed both invalid arguments, while it displayed too many arguments for the option functions under the same conditions.

[PATCH v6 29/31] git-remote-mediawiki: Add a .perlcriticrc file

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr Such a file allows to configure perlcritic. Here, it is used to remove many unwanted rules and configure one to remove unwanted warnings. Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy

[PATCH v6 10/31] git-remote-mediawiki: Change separator of some regexps

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr Use {}{} instead of /// when slashes are used inside the regexp so as not to escape it. Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr --- contrib/mw-to-git/git-remote-mediawiki.perl

[PATCH v6 20/31] git-remote-mediawiki: remove import of unused open2

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr --- contrib/mw-to-git/git-remote-mediawiki.perl | 1 - 1 file changed, 1 deletion(-) diff --git

[PATCH v6 28/31] git-remote-mediawiki: Clearly rewrite double dereference

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr @$var structures are re-written in the following way: @{$var} It makes them more readable. Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr ---

[PATCH v6 11/31] git-remote-mediawiki: Change style in a regexp

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr In this regexp, ' |\n' is used, whereas its equivalent '[ \n]', which is clearer, is used elsewhere. Make the style coherent. Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr ---

[PATCH v6 03/31] git-remote-mediawiki: Replace :utf8 by :encoding(UTF-8)

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr Follow perlcritic's InputOutput::RequireEncodingWithUTF8Layer policy Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr --- contrib/mw-to-git/git-remote-mediawiki.perl | 6 +++--- 1 file

[PATCH v6 21/31] git-remote-mediawiki: Put long code into a subroutine

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr --- contrib/mw-to-git/git-remote-mediawiki.perl | 56 - 1 file changed, 32 insertions(+), 24 deletions(-)

[PATCH v6 15/31] git-remote-mediawiki: Turn double-negated expressions into simple expressions

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr --- contrib/mw-to-git/git-remote-mediawiki.perl | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git

[PATCH v6 18/31] git-remote-mediawiki: Assign a variable as undef and make proper indentation

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr Explicitly assign local variable $/ as undef and make a proper one-instruction-by-line indentation Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr ---

Re: [PATCH] format-patch: remove existing output-directory

2013-06-14 Thread Ramkumar Ramachandra
SZEDER Gábor wrote: _git_fp () { _git_format_patch ; } Good stopgap, 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 v6 22/31] git-remote-mediawiki: Modify strings for a better coding-style

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr - strings which don't need interpolation are single-quoted for more clarity and slight gain of performance - interpolation is preferred over concatenation in many cases, for more clarity - variables are always used with the ${} operator inside

[PATCH v6 16/31] git-remote-mediawiki: Remove unused variable $entry

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr --- contrib/mw-to-git/git-remote-mediawiki.perl | 1 - 1 file changed, 1 deletion(-) diff --git

[PATCH v6 17/31] git-remote-mediawiki: Rename a variable ($last) which has the name of a keyword

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr --- contrib/mw-to-git/git-remote-mediawiki.perl | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git

[PATCH v6 02/31] git-remote-mediawiki: Move use warnings; before any instruction

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr --- contrib/mw-to-git/git-remote-mediawiki.perl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git

[PATCH v6 25/31] git-remote-mediawiki: Don't use quotes for empty strings

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr Empty strings are replaced by an $EMPTY constant. Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr --- contrib/mw-to-git/git-remote-mediawiki.perl | 18 ++ 1 file

[PATCH v6 23/31] git-remote-mediawiki: Brace file handles for print for more clarity

2013-06-14 Thread Célestin Matte
From: Célestin Matte celestin.ma...@ensimag.fr This follows the following rule: InputOutput::RequireBracedFileHandleWithPrint (Severity: 1) The `print' and `printf' functions have a unique syntax that supports an optional file handle argument. Conway suggests wrapping this argument in

Re: [PATCH] format-patch: remove existing output-directory

2013-06-14 Thread Ramkumar Ramachandra
Fredrik Gustafsson wrote: git format-patch always creates a new directory like: .git/outgoing/[patchname]FROM commit short sha1...TO commit short sha1 and possible runs a custom command afterwards. Like cd to the patch directory, open the cover-letter in your editor etc. git send-email

Re: [PATCH] format-patch: remove existing output-directory

2013-06-14 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: On Fri, Jun 14, 2013 at 06:13:33PM +0530, Ramkumar Ramachandra wrote: The following command $ git format-patch -o outgoing master does not ensure that the output-directory outgoing doesn't already exist. As a result, it's possible for patches

Re: [PATCH] format-patch: remove existing output-directory

2013-06-14 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: On Fri, Jun 14, 2013 at 06:45:19PM +0530, Ramkumar Ramachandra wrote: John Keeping wrote: I don't think this is the correct behaviour. I can think of cases where I would want to output multiple things into the same directory.

Re: [PATCH] prompt: squelch error output from cat

2013-06-14 Thread SZEDER Gábor
On Thu, Jun 13, 2013 at 08:15:59PM +0530, Ramkumar Ramachandra wrote: SZEDER Gábor wrote: Just curious: when do those files don't exist? When using an older version of git with a newer prompt, obviously, but are there other cases? # On terminal one $ git rebase --interactive master

Re: [PATCH 5/6] status: do not depend on flaky reflog messages

2013-06-14 Thread Ramkumar Ramachandra
Junio C Hamano wrote: The part you stripped from your quote looked like this: Apologies for the lack of clarity. You were at 1.8.2 but no longer are, so in the following sequence: $ git checkout v1.8.2 $ git status $ git reset --hard HEAD^ $ git status the former would

Re: [PATCH v2 0/5] Write a good 'git stash store' for autostash

2013-06-14 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: So, I've taken Junio's suggestion and designed a proper command-line interface for 'git stash store' in this iteration: git stash store [-m message] [-e error] commit I am perplexed; that would not something I _would_ design or suggest. The

Re: [PATCH 5/6] status: do not depend on flaky reflog messages

2013-06-14 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: In this example, it is inconsequential whether I run: $ git checkout v1.8.2^ or: $ git checkout v1.8.2 $ git reset --hard @^ as far as describe is concerned. It will give me the same good consistent answer in either case. Yes,

Re: [PATCH] unpack_entry: do not die when we fail to apply a delta

2013-06-14 Thread Junio C Hamano
Makes sense. Thanks, will queue. -- 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 v2 1/2] [submodule] handle multibyte characters in name

2013-06-14 Thread Junio C Hamano
Fredrik Gustafsson iv...@iveqy.com writes: Many git submodule operations do not work on a submodule at a path whose name is not in ASCII. Thanks. A suggestion to add some more explanation to the log message follows. This is because git ls-files is used to find which paths are bound to

Re: [PATCH 1/2] am: handle stray $dotest directory

2013-06-14 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: The following bug has been observed: $ git am # no input file ^C $ git am --abort Resolve operation not in progress, we are not resuming. This happens because the following test fails: test -d $dotest test -f $dotest/last test

Re: [PATCH 5/6] status: do not depend on flaky reflog messages

2013-06-14 Thread Ramkumar Ramachandra
Junio C Hamano wrote: As I said (twice), you can argue that that particular piece of information is not useful (at least to you), but why it is not useful has to be justified, against the justification given by b397ea4863a1 (status: show more info than currently not on any branch, 2013-03-13)

Re: [PATCH 1/2] am: handle stray $dotest directory

2013-06-14 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: + die $(eval_gettext Stray $dotest directory found. +Use \git am --abort\ to remove it.) $dotest, or \$dotest? -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH 1/2] am: handle stray $dotest directory

2013-06-14 Thread Ramkumar Ramachandra
Junio C Hamano wrote: These two case arms are indented one level too deep (will locally touch up). Thanks. Can you tell me how to get shell-script-mode to indent the case statement properly? (I used the default indentation) -- To unsubscribe from this list: send the line unsubscribe git in the

Re: [PATCH 1/5] stash doc: add a warning about using create

2013-06-14 Thread Junio C Hamano
Phil Hord phil.h...@gmail.com writes: DESCRIPTION --- @@ -151,6 +151,7 @@ create:: Create a stash (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. + This is probably not what you want to use;

Re: [PATCH 1/2] am: handle stray $dotest directory

2013-06-14 Thread Ramkumar Ramachandra
Junio C Hamano wrote: $dotest, or \$dotest? Works fine for me like this. Why do we escape the dollar in the other strings? -- 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 0/5] Write a good 'git stash store' for autostash

2013-06-14 Thread Ramkumar Ramachandra
Junio C Hamano wrote: git stash store [-m message] [-e error] commit I am perplexed; that would not something I _would_ design or suggest. The -e error looks especially odd, in that -e usually refers to something the command evaluates (e.g. sed, perl), but more importantly if the caller

Re: [PATCH 1/2] am: handle stray $dotest directory

2013-06-14 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: +# Possible stray $dotest directory +if test -d $dotest; then +case $skip,$resolved,$abort in +,,t) +rm -fr $dotest +exit 0 +;; +*) +

Re: [PATCH 1/2] am: handle stray $dotest directory

2013-06-14 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: $dotest, or \$dotest? Works fine for me like this. Why do we escape the dollar in the other strings? The reason would become clear once you think what string you are feeding eval_gettext with if you do not escape. The

Re: [PATCH 2/3] sh-setup: add new peel_committish() helper

2013-06-14 Thread Ramkumar Ramachandra
Philip Oakley wrote: Is there a proper name for this style of revision specification? I've been letting this 'style' wash over me in the hope that I'd understand eventually, but it hasn't. See gitrevisions(7). None of them have any names. Loking at git-rev-parse I now see that it might be

Difficulty adding a symbolic link

2013-06-14 Thread Dale R. Worley
I'm having a problem with git add in version 1.7.7.6. The situation is that I have a repository that is contained in a second-level directory, a sub-sub-directory of /. The core.worktree of the repository is /, so the working directory is the entire file tree. I want this repository to track

Re: [PATCH 5/6] status: do not depend on flaky reflog messages

2013-06-14 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: As I said (twice), you can argue that that particular piece of information is not useful (at least to you), but why it is not useful has to be justified, against the justification given by b397ea4863a1 (status: show more

Re: [PATCH 2/3] sh-setup: add new peel_committish() helper

2013-06-14 Thread Philip Oakley
From: Ramkumar Ramachandra artag...@gmail.com Sent: Friday, June 14, 2013 5:18 PM Philip Oakley wrote: Is there a proper name for this style of revision specification? I've been letting this 'style' wash over me in the hope that I'd understand eventually, but it hasn't. See gitrevisions(7).

Re: [PATCH 3/3] rebase: use peel_committish() where appropriate

2013-06-14 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: The revisions specified on the command-line as onto and upstream arguments could be of the form :/quuxery; so, use peel_committish() to resolve them. The failing tests in t/rebase and t/rebase-interactive now pass. You can also specify the

Re: [PATCH 1/2] am: handle stray $dotest directory

2013-06-14 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: And then the message triggers at the second test in t3420 when applied on top of 587947750bd7 (rebase: implement --[no-]autostash and rebase.autostash, 2013-05-12) or 45acb7592825 (Merge branch 'rr/rebase-autostash',

Re: [PATCH 1/2] am: handle stray $dotest directory

2013-06-14 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: The reason would become clear once you think what string you are feeding eval_gettext with if you do not escape. The translators translate a fixed string (possibly with placeholders) to a fixed translated string (possibly

Re: [[PATCH v3] 1/2] [submodule] handle multibyte characters in name

2013-06-14 Thread Junio C Hamano
Fredrik Gustafsson iv...@iveqy.com writes: ... The correct approach to solve the problem for all pathnames may be to use ls-files -z and tell the Perl script that reads its output to read NUL separated records by using $/ = \0. I've tentatively queued the attached without 2/2; the scriptlet

[PATCH] . git.el: use commit.template if available

2013-06-14 Thread Curt Brune
If the user's git config defines commit.template then include the contents of that file in the log buffer by default. In git-setup-log-buffer, instead of supplying the default commit message insert the user's commit.template. Signed-off-by: Curt Brune c...@brune.net --- contrib/emacs/git.el |

Re: [RFH/PATCH 0/4] git http tests with apache 2.4

2013-06-14 Thread Junio C Hamano
Jeff King p...@peff.net writes: Apache 2.4 recently shipped in Debian unstable, and I noticed that all of the git httpd tests stopped working. It turns out that some configuration directives have changed between 2.2 and 2.4, and the httpd server would not start at all. With this series, the

Re: [PATCH] . git.el: use commit.template if available

2013-06-14 Thread Junio C Hamano
Curt Brune c...@brune.net writes: If the user's git config defines commit.template then include the contents of that file in the log buffer by default. In git-setup-log-buffer, instead of supplying the default commit message insert the user's commit.template. Signed-off-by: Curt Brune

  1   2   >