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.
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'
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
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(+),
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
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
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
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
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
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
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
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:
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
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
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
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
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
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
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
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
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
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
---
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
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
---
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
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
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
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,
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
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
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:
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
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
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
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
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
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
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,
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
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
---
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
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
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
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
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
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
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,
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;
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
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 +++
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
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 @@
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
+++
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
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
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
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
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
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
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
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
61 matches
Mail list logo
