Re: [PATCH v2 02/11] tests: at-combinations: check ref names directly

2013-05-08 Thread Felipe Contreras
On Wed, May 8, 2013 at 12:55 AM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Some committishes might point to the same commit, but through a different ref, that's why it's better to check directly for the ref, rather than the commit message.

Re: [PATCH v2 03/11] tests: at-combinations: improve nonsense()

2013-05-08 Thread Felipe Contreras
On Wed, May 8, 2013 at 12:55 AM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: In some circumstances 'git log' might fail, but not because the @ parsing failed. For example: 'git rev-parse' might succeed and return a bad object, and then 'git log'

Re: What's cooking in git.git (May 2013, #02; Mon, 6)

2013-05-08 Thread Ramkumar Ramachandra
Felipe Contreras wrote: This series has cleanups and features that are good as they are. Ramkumar said he was going to resend his cleanup series, but he didn't. I'll try to gather all the patches and split them into cleanups, and features. Thanks for picking up the pieces. I was out of town

[PATCH 0/2] completion: zsh wrapper cleanups

2013-05-08 Thread Felipe Contreras
Hi, Nothing fancy, just some cleanups for the minimal zsh backup wrapper in bash's completion code. Felipe Contreras (2): completion: cleanup zsh wrapper completion: synchronize zsh wrapper contrib/completion/git-completion.bash | 22 +++--- 1 file changed, 7 insertions(+),

[PATCH 1/2] completion: cleanup zsh wrapper

2013-05-08 Thread Felipe Contreras
There's no need for a separate function; we can call 'emulate -k ksh func'. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/completion/git-completion.bash | 18 +- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git

[PATCH 2/2] completion: synchronize zsh wrapper

2013-05-08 Thread Felipe Contreras
So it's closer to the full zsh wrapper. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/completion/git-completion.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash

Re: [PATCH v2 10/11] sha1_name: reorganize get_sha1_basic()

2013-05-08 Thread Ramkumar Ramachandra
Felipe Contreras wrote: --- sha1_name.c | 30 +++--- 1 file changed, 19 insertions(+), 11 deletions(-) How has this changed since my eyeballing of the previous version? An inter-diff would be nice: having spent a significant amount of time looking at this area, I can

Re: [PATCH v2 10/11] sha1_name: reorganize get_sha1_basic()

2013-05-08 Thread Felipe Contreras
On Wed, May 8, 2013 at 2:39 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Felipe Contreras wrote: --- sha1_name.c | 30 +++--- 1 file changed, 19 insertions(+), 11 deletions(-) How has this changed since my eyeballing of the previous version? An inter-diff

RE: trouble on windows network share

2013-05-08 Thread David Goldfarb
Here's one more data point. It suggests that the problem is due to either Cygwin or possibly Git 1.7.9. My Ubuntu box is actually a VM, hosted by my windows box in VMWare Player. So, I tried using the VMWare shared folder feature, to mount the Windows U: drive (which is physically on the WD

Minor correction to Git book

2013-05-08 Thread Robin Messer
I'm just learning Git so I don't yet know how to submit this as a patch, but I'm reading the Git Book to get myself started and I think there is a mistake on the page at: http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository It says: For another example, if you stage the

Re: [PATCH v2 00/11] sha1_name: improvements

2013-05-08 Thread Ramkumar Ramachandra
Junio C Hamano wrote: Will queue. Thanks. Nit: you might want to add my s-o-b on patches 73027d and b018e8 queued in pu. -- 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: Minor correction to Git book

2013-05-08 Thread John Keeping
On Wed, May 08, 2013 at 11:24:56AM +0100, Robin Messer wrote: I'm just learning Git so I don't yet know how to submit this as a patch, but I'm reading the Git Book to get myself started and I think there is a mistake on the page at:

RE: Minor correction to Git book

2013-05-08 Thread Robin Messer
I think the text is correct as it stands. git status shows you that there are changes that are staged and unstaged, git diff (and git diff --cached) shows you what those changes are. Thanks, but the command line which follows that text does actually use git status to show which files (staged

Re: Minor correction to Git book

2013-05-08 Thread John Keeping
On Wed, May 08, 2013 at 12:01:00PM +0100, Robin Messer wrote: I think the text is correct as it stands. git status shows you that there are changes that are staged and unstaged, git diff (and git diff --cached) shows you what those changes are. Thanks, but the command line which follows

[PATCH v7 00/10] interactive git clean

2013-05-08 Thread Jiang Xin
Significant updates since patch v6 series: * Refactor on patch 4/10: split `list_and_choose` into 3 functions, to make it easy to read. * Mark no public functions as static for patch 1-10. * If set 'pager.clean' to true (i.e. isatty(1) is false), die instead of do cleaning. * New

[PATCH v7 01/10] Add support for -i/--interactive to git-clean

2013-05-08 Thread Jiang Xin
Show what would be done and the user must confirm before actually cleaning. In the confirmation dialog, the user has three choices: * y/yes: Start to do cleaning. * n/no: Nothing will be deleted. * e/edit: Exclude items from deletion using ignore patterns. When the user chooses the edit

[PATCH v7 02/10] Show items of interactive git-clean in columns

2013-05-08 Thread Jiang Xin
When there are lots of items to be cleaned, it is hard to see them all in one screen. Show them in columns instead of in one column will solve this problem. Since no longer show items to be cleaned using the Would remove ... format (only plain filenames) in interactive mode, we add instructions

[PATCH v7 03/10] Add colors to interactive git-clean

2013-05-08 Thread Jiang Xin
Show header, help, error messages, and prompt in colors for interactive git-clean. Re-use config variables for other git commands, such as git-add--interactive and git-stash: * color.interactive: When set to always, always use colors for interactive prompts and displays. When false (or

[PATCH v7 04/10] git-clean: use a git-add-interactive compatible UI

2013-05-08 Thread Jiang Xin
Rewrite menu using a new method `list_and_choose`, which is borrowed from `git-add--interactive.perl`. We can reused this method later for more actions. Please NOTE: * Method `list_and_choose` return an array of integers, and * it is up to you to free the allocated memory of the array. * The

[PATCH v7 05/10] git-clean: interactive cleaning by select numbers

2013-05-08 Thread Jiang Xin
Draw a multiple choice menu using `list_and_choose` to select items to be deleted by numbers. User can input: * 1,5-7 : select 1,5,6,7 items to be deleted * * : select all items to be deleted * -*: unselect all, nothing will be deleted *: (empty) finish selecting, and

[PATCH v7 06/10] git-clean: rm -i style interactive cleaning

2013-05-08 Thread Jiang Xin
Add a rm -i style interactive cleaning method. User must confirm one by one before starting to delete. Signed-off-by: Jiang Xin worldhello@gmail.com --- builtin/clean.c | 36 1 file changed, 36 insertions(+) diff --git a/builtin/clean.c b/builtin/clean.c

[PATCH v7 07/10] git-clean: update document for interactive git-clean

2013-05-08 Thread Jiang Xin
Signed-off-by: Jiang Xin worldhello@gmail.com --- Documentation/git-clean.txt | 70 - 1 file changed, 63 insertions(+), 7 deletions(-) diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt index f5572..47e8e 100644 ---

[PATCH v7 08/10] git-clean refactor: save some options in clean_flags

2013-05-08 Thread Jiang Xin
Save some options in variable clean_flags, such as -ff (force 1), -x (ignored), -X (ignored_only), and -d (remove_directories). We may change clean_flags later in the interactive git-clean. Signed-off-by: Jiang Xin worldhello@gmail.com --- builtin/clean.c | 46

[PATCH v7 09/10] git-clean refactor: wrap in scan_clean_candidates

2013-05-08 Thread Jiang Xin
Add new function `scan_clean_candidates`, which determines the del_list (i.e. the cleaning candidates). This function will be reused later in the interactive git-clean, so we can change flags of git-clean and refresh the del_list. Signed-off-by: Jiang Xin worldhello@gmail.com ---

[PATCH v7 10/10] git-clean: change clean flags in interactive mode

2013-05-08 Thread Jiang Xin
Add new action in the interactive mode, so that the user can change git-clean flags, such as -x/-X/-d/-ff, and refresh the cleaning candidates list. Signed-off-by: Jiang Xin worldhello@gmail.com --- Documentation/git-clean.txt | 11 +++-- builtin/clean.c | 117

`git prune` doc or implementation defect, or user misunderstanding

2013-05-08 Thread Matt McClure
The `git prune` documentation says: This runs git fsck --unreachable using all the refs available in refs/, optionally with additional set of objects specified on the command line, and prunes all unpacked objects unreachable from any of these head objects from

Re: 3 way merge during git p4 rebase is attempting to reapply past commits

2013-05-08 Thread Christopher Yee Mon
git p4 rebase and git p4 submit don't work on a bare repo (at least it didn't for me) This is weird since there is a --bare option for git p4 clone, but then you can't do git p4 submit's on that bare repo back up to perforce? I got an error stating: git p4 rebase Performing incremental import

Re: `git prune` doc or implementation defect, or user misunderstanding

2013-05-08 Thread Johannes Sixt
Am 5/8/2013 16:19, schrieb Matt McClure: My interpretation of that is that `git prune` will not prune packed objects by default. The following behavior seems inconsistent with that interpretation. [git@438587-beefcake01 panama.git]$ git prune -n | wc -l 9210 You have 9210 unreachable,

Re: Problems with Windows, Was: What's cooking in git.git (May 2013, #01; Fri, 3)

2013-05-08 Thread Torsten Bögershausen
On 2013-05-08 02.30, Mark Levedahl wrote: On 05/07/2013 10:27 AM, Torsten Bögershausen wrote: On 2013-05-04 01.14, Junio C Hamano wrote: Cygwin portability; both were reviewed by Jonathan, and the tip one seems to want a bit further explanation. Needs positive report from Cygwin 1.7

Re: [PATCH v7 00/10] interactive git clean

2013-05-08 Thread Eric Sunshine
On Wed, May 8, 2013 at 7:38 AM, Jiang Xin worldhello@gmail.com wrote: When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop. Your current implementation only allows excluding items from the list of files

Re: [PATCH v7 00/10] interactive git clean

2013-05-08 Thread Eric Sunshine
On Wed, May 8, 2013 at 11:15 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Wed, May 8, 2013 at 7:38 AM, Jiang Xin worldhello@gmail.com wrote: *** Commands *** 1: clean 2: edit by patterns3: edit by numbers 4: rm -i 5: flags: none 6:

Re: `git prune` doc or implementation defect, or user misunderstanding

2013-05-08 Thread Matt McClure
On Wed, May 8, 2013 at 10:41 AM, Johannes Sixt j.s...@viscovery.net wrote: git gc moves unreachable objects that were packed before to the loose object store, from where they can be pruned. Thanks. That was the piece I was missing. I assumed `git gc` did the opposite. -- Matt McClure

Re: [PATCH v7 00/10] interactive git clean

2013-05-08 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: On Wed, May 8, 2013 at 7:38 AM, Jiang Xin worldhello@gmail.com wrote: When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop. Your current implementation

Avoiding broken Gitweb links and deleted objects

2013-05-08 Thread Matt McClure
On Wed, May 8, 2013 at 12:05 PM, Matt McClure matthewlmccl...@gmail.com wrote: On Wed, May 8, 2013 at 10:41 AM, Johannes Sixt j.s...@viscovery.net wrote: git gc moves unreachable objects that were packed before to the loose object store, from where they can be pruned. Thanks. That was the

Re: [PATCH v7 01/10] Add support for -i/--interactive to git-clean

2013-05-08 Thread Junio C Hamano
Jiang Xin worldhello@gmail.com writes: Show what would be done and the user must confirm before actually cleaning. In the confirmation dialog, the user has three choices: * y/yes: Start to do cleaning. * n/no: Nothing will be deleted. * e/edit: Exclude items from deletion using

Re: [PATCH v7 02/10] Show items of interactive git-clean in columns

2013-05-08 Thread Junio C Hamano
Nice (I didn't read the code, though). -- 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 v7 04/10] git-clean: use a git-add-interactive compatible UI

2013-05-08 Thread Junio C Hamano
Nice (I didn't read the code, though). -- 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 10/11] sha1_name: reorganize get_sha1_basic()

2013-05-08 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Through the years the functionality to handle @{-N} and @{u} has moved around the code, and as a result, code that once made sense, doesn't any more. There is no need to call this function recursively with the branch of @{-N} substituted

Re: [PATCH v2 10/11] sha1_name: reorganize get_sha1_basic()

2013-05-08 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Also, a few points this patch highlights in the code before the change: - If we were on a branch with 40-hex name at nth prior checkout, would we mistake it as being detached at the commit? - If we were on a branch 'foo' at nth prior checkout,

Re: [BUG] shallow clones over http

2013-05-08 Thread Junio C Hamano
Jeff King p...@peff.net writes: I'm trying to track down a protocol bug that happens with shallow clones over smart-http. As far as I can tell, the bug has existed in all versions. You can reproduce it using the attached repository, which is a shallow clone of

[PATCHv2] CodingGuidelines: make it clear which files in Documentation/ are the sources

2013-05-08 Thread Dale R. Worley
From e87227498ef3d50dc20584c24c53071cce63c555 Mon Sep 17 00:00:00 2001 From: Dale Worley wor...@ariadne.com Date: Tue, 7 May 2013 13:39:46 -0400 Subject: [PATCH] CodingGuidelines: make it clear which files in Documentation/ are the sources Signed-off-by: Dale R. Worley wor...@ariadne.com ---

Re: [PATCHv2] CodingGuidelines: make it clear which files in Documentation/ are the sources

2013-05-08 Thread Junio C Hamano
wor...@alum.mit.edu (Dale R. Worley) writes: From e87227498ef3d50dc20584c24c53071cce63c555 Mon Sep 17 00:00:00 2001 From: Dale Worley wor...@ariadne.com Date: Tue, 7 May 2013 13:39:46 -0400 Subject: [PATCH] CodingGuidelines: make it clear which files in Documentation/ are the sources

Re: [PATCH v2 10/11] sha1_name: reorganize get_sha1_basic()

2013-05-08 Thread Felipe Contreras
On Wed, May 8, 2013 at 1:18 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Through the years the functionality to handle @{-N} and @{u} has moved around the code, and as a result, code that once made sense, doesn't any more. There is no need

[PATCH 1/2] sha1_name.c: signal if @{-N} was a true branch nameor a detached head

2013-05-08 Thread Junio C Hamano
The original API read checkout: moving from (.*) to ... from the reflog of the HEAD, and returned the substring between from and to, but there was no way, if the substring was a 40-hex string, to tell if we were on a detached HEAD at that commit object, or on a branch whose name happened to be the

[PATCH 2/2] interpret_branch_name(): unconfuse @{-1}@{u} when @{-1} is detached

2013-05-08 Thread Junio C Hamano
Now interpret_nth_prior_checkout() can tell the caller if the result of expansion of @{-1} is a real branch name or the commit object name for a detached HEAD state, let's avoid re-interpreting $HEX@{u} in the latter case. Signed-off-by: Junio C Hamano gits...@pobox.com --- * This prevents us

[non PATCH */2] preparatory analysis of remaining @{...} issues

2013-05-08 Thread Junio C Hamano
Currently interpret_branch_name() takes either @{-N}, @{u}, or some@{u} and returns an abbreviated refname, or a detached HEAD if @{-N} resolves to such a state. Local branch names coming back for @{-N} are returned as branch names without refs/heads/, upstream names coming back for @{u} are

Re: [PATCH v2 10/11] sha1_name: reorganize get_sha1_basic()

2013-05-08 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: On Wed, May 8, 2013 at 1:18 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Through the years the functionality to handle @{-N} and @{u} has moved around the code, and as a result, code that

Re: [PATCH v2 10/11] sha1_name: reorganize get_sha1_basic()

2013-05-08 Thread Felipe Contreras
On Wed, May 8, 2013 at 4:51 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: On Wed, May 8, 2013 at 1:18 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Through the years the functionality to

Re: [PATCH v2 1/2] help: add help_unknown_ref

2013-05-08 Thread Junio C Hamano
Vikrant Varma vikrant.varm...@gmail.com writes: When a ref is not known, currently functions call die() with an error message. The first part read somewhat awkward, so I started rewriting the above like so: When the user gives an unknown string to a command that expects to see a ref,

Re: [PATCH 4/5] git-svn: fix bottleneck in stash_placeholder_list()

2013-05-08 Thread Eric Wong
Ilya Basin basini...@gmail.com wrote: Hi Eric. I'm out of spare time and I still unable to import my repo. The code of SVN.pm is too complex. Please help me. Sorry, most what I do nowadays for git-svn is ACK/NACK changes. git-svn has made itself obsolete for most contributors, myself included;

Re: [PATCH] Git::SVN::*: add missing NAME section to perldoc

2013-05-08 Thread Eric Wong
Jonathan Nieder jrnie...@gmail.com wrote: Just noticed this by running a tool to sanity-check my build result. I hadn't noticed before because I hadn't been installing the manpages. Anyway, perhaps the patch can be useful. Thanks, signed-off and applied, will push. -- To unsubscribe from this

[PATCH 0/4] trivial patches

2013-05-08 Thread Felipe Contreras
Hi, Here's a bunch of trivial style cleanup patches. Felipe Contreras (4): documentation: trivial style cleanups transport-helper: trivial style cleanup {fast-export,transport-helper}: style cleanups fast-export: trivial cleanup Documentation/git-am.txt | 7 +++

[PATCH 1/4] documentation: trivial style cleanups

2013-05-08 Thread Felipe Contreras
White-spaces, missing braces, standardize --[no-]foo. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-am.txt | 7 +++ Documentation/git-archive.txt | 2 +- Documentation/git-check-ref-format.txt | 3 +-- Documentation/git-clone.txt

[PATCH 2/4] transport-helper: trivial style cleanup

2013-05-08 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- transport-helper.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/transport-helper.c b/transport-helper.c index 835815f..522d791 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -214,9 +214,8 @@

[PATCH 3/4] {fast-export,transport-helper}: style cleanups

2013-05-08 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/fast-export.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index d60d675..8091354 100644 --- a/builtin/fast-export.c +++

[PATCH 4/4] fast-export: trivial cleanup

2013-05-08 Thread Felipe Contreras
Cast the object to a commit, only to get the object back? Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/fast-export.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 8091354..d24b4d9 100644 ---

Re: [PATCH] git-svn: added an --include-path flag

2013-05-08 Thread Eric Wong
Paul Walmsley pjwh...@gmail.com wrote: The SVN::Fetcher module is now able to filter for inclusion as well as exclusion (as used by --ignore-path). Also added tests, documentation changes and git completion script. If you have an SVN repository with many top level directories and you only

[PATCH 2/3] mingw.h: Define only if necessary

2013-05-08 Thread Sven Strickroth
Since the latest version of MSVC EWOULDBLOCK, EAFNOSUPPORT and ECONNABORTED are defined in errno.h. When used with MSVC mingw.h is included from msvc.h and causes warnings about redefinitions. Signed-off-by: Sven Strickroth em...@cs-ware.de --- compat/mingw.h | 6 ++ 1 file changed, 6

[PATCH 1/3] poll.h lies in the same folder, so use normal quotes for include

2013-05-08 Thread Sven Strickroth
Some compilers, like Visual C++ complain when is used instead of double quotes for non system includes. Signed-off-by: Sven Strickroth em...@cs-ware.de --- compat/poll/poll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/poll/poll.c b/compat/poll/poll.c index

[PATCH 3/3] Initialize variables with values

2013-05-08 Thread Sven Strickroth
With MSVC initializing a variable with int a=a causes a warning about using an uninitialized value. Signed-off-by: Sven Strickroth em...@cs-ware.de --- builtin/rev-list.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/rev-list.c b/builtin/rev-list.c index

[PATCH 1/3] fast-export: improve argument parsing

2013-05-08 Thread Felipe Contreras
We don't want to pass arguments specific to fast-export to setup_revisions. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/fast-export.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index

[PATCH 2/3] fast-export: add new --refspec option

2013-05-08 Thread Felipe Contreras
So that we can covert the exported ref names. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-fast-export.txt | 4 builtin/fast-export.c | 30 ++ t/t9350-fast-export.sh| 7 +++ 3 files changed, 41

[PATCH 3/3] transport-helper: add support for old:new refspec

2013-05-08 Thread Felipe Contreras
By using fast-export's new --refspec option. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t5801-remote-helpers.sh | 2 +- transport-helper.c| 14 -- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/t/t5801-remote-helpers.sh

Re: [PATCH 1/5] msvc: Fix compilation errors caused by poll.h emulation

2013-05-08 Thread Sven Strickroth
Am 31.01.2013 19:28 schrieb Ramsay Jones: Commit 0f77dea9 (mingw: move poll out of sys-folder, 24-10-2011), along with other commits in the 'ef/mingw-upload-archive' branch (see commit 7406aa20), effectively reintroduced the same problem addressed by commit 56fb3ddc (msvc: Fix compilation