This round addresses the code sharing issue in the previous round and
shows a bit more info in both git-status and git-branch. Now when you
do git checkout v1.8.0 or git checkout origin/master, you should
see that ref in status/branch output, in addition to detached HEAD
status.
Nguyễn Thái Ngọc
This simplifies parsing later on because the parser does not need to
do dwim on the target (and later dwim may be ambiguous if new refs are
added).
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/checkout.c | 19 ---
1 file changed, 16 insertions(+), 3
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
wt-status.c | 52 +++-
wt-status.h | 5 +++--
2 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/wt-status.c b/wt-status.c
index ef405d0..183aafe 100644
--- a/wt-status.c
+++
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
wt-status.c | 37 +++--
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/wt-status.c b/wt-status.c
index 183aafe..6a3566b 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1044,31 +1044,29 @@
When a remote ref or a tag is checked out, HEAD is automatically
detached. There is no user friendly way to find out what ref is
checked out in this case. This patch digs in reflog for this
information and shows Detached from origin/master or Detached from
v1.8.0 instead of Currently not on any
This prints more helpful info when HEAD is detached: is it detached
because of bisect or rebase? What is the original branch name in those
cases? Is it detached because the user checks out a remote ref or a
tag (and which one)?
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
The tip of the 'master' is at 1.8.2-rc2. Hopefully we can tag the
final in the middle of the month.
You can find the changes described here
A release candidate Git v1.8.2-rc2 is now available for testing
at the usual places.
The release tarballs are found at:
http://code.google.com/p/git-core/downloads/list
and their SHA-1 checksums are:
b10a10d8e6351860fde123ffc62081e3800d602c git-1.8.2.rc2.tar.gz
On Sat, Mar 02, 2013 at 08:16:13PM +0100, Thomas Rast wrote:
John Keeping j...@keeping.me.uk writes:
This reverts commit ba35480439d05b8f6cca50527072194fe3278bbb.
CGit uses these symbols to output the correct HTML around graph
elements. Making these symbols private means that CGit
This is the much truncated (was 0/13] and updated series for
noting that 'git help' can display the existing guides that are
formatted as man pages, and providing a 'git help' option to list
a few of the most useful guides.
The series is rebased on top of V1.8.2-rc1
Differences relative to V1
The git(1) man page must be accessed via 'git help git' on Git for Windows
as it has no 'man' command. And it prompts users to read the git(1) page,
rather than hoping they follow a subsidiary link within another
documentation page. The 'tutorial' is an obvious guide to suggest.
Signed-off-by:
Re-use list_common_cmds_help but simply change the array name.
Candidate for future refactoring to pass a pointer to the array.
The common-guides.h list was generated with a simple variant of the
generate-cmdlist.sh and command-list.txt.
Do not list User-manual and Everday Git which not follow
rename deprecated option in preparation for 'git help --guides'.
Signed-off-by: Philip Oakley philipoak...@iee.org
---
builtin/help.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/help.c b/builtin/help.c
index d1d7181..d10cbed 100644
--- a/builtin/help.c
+++
Logic, but no actions, included.
The --all commands option, if given, will display first.
The --guide option's list will then be displayed.
The common commands list is only displayed if neither option,
nor a command or guide name, is given.
Signed-off-by: Philip Oakley philipoak...@iee.org
---
Note that the ability to display an individual guide was
always possible. Include this in the update.
Also tell readers how git(1) can be accessed, especially for
Git for Windows users who do not have the 'man' command.
Likewise include a commentary on how to access this page (Catch 22).
On Wed, Feb 27, 2013 at 12:20:07PM -0800, Junio C Hamano wrote:
Without --all the command considers only the annotated tags to
base the descripion on, and with --all, a ref that is not
annotated tags can be used as a base, but with a lower priority (if
an annotated tag can describe a given
John Keeping j...@keeping.me.uk writes:
On Sat, Mar 02, 2013 at 08:16:13PM +0100, Thomas Rast wrote:
John Keeping j...@keeping.me.uk writes:
This reverts commit ba35480439d05b8f6cca50527072194fe3278bbb.
CGit uses these symbols to output the correct HTML around graph
elements. Making
Greg Price pr...@mit.edu writes:
On Wed, Feb 27, 2013 at 12:20:07PM -0800, Junio C Hamano wrote:
Without --all the command considers only the annotated tags to
base the descripion on, and with --all, a ref that is not
annotated tags can be used as a base, but with a lower priority (if
an
On Sun, Mar 03, 2013 at 01:08:50PM -0800, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
On Sat, Mar 02, 2013 at 08:16:13PM +0100, Thomas Rast wrote:
John Keeping j...@keeping.me.uk writes:
This reverts commit ba35480439d05b8f6cca50527072194fe3278bbb.
CGit uses
On Sun, Mar 03, 2013 at 01:15:21PM -0800, Junio C Hamano wrote:
Greg Price pr...@mit.edu writes:
It seems to me that --all says two things:
(a) allow unannotated (rather than only annotated)
(b) allow refs of any name (rather than only tags)
With --match, particularly because the
When a remote ref or a tag is checked out, HEAD is automatically
detached. There is no user friendly way to find out what ref is
checked out in this case. This patch digs in reflog for this
information and shows Detached from origin/master or Detached from
v1.8.0 instead of Currently not on
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
This prints more helpful info when HEAD is detached: is it detached
because of bisect or rebase? What is the original branch name in those
cases? Is it detached because the user checks out a remote ref or a
tag (and which one)?
Signed-off-by:
John Keeping j...@keeping.me.uk writes:
On Sun, Mar 03, 2013 at 01:08:50PM -0800, Junio C Hamano wrote:
Additionally, it seems that Johan added graph_set_column_colors
specifically so that CGit should use it - there's no value to having
that as a method just for its use in graph.c and
On Sun, Mar 03, 2013 at 02:49:12PM -0800, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
On Sun, Mar 03, 2013 at 01:08:50PM -0800, Junio C Hamano wrote:
Additionally, it seems that Johan added graph_set_column_colors
specifically so that CGit should use it - there's no
John Keeping j...@keeping.me.uk writes:
Also it probably is worth adding contact information for folks who
work on CGit (http://hjemli.net/git/cgit/ might be sufficient),
The current CGit homepage is http://git.zx2c4.com/cgit/
As the hjemli.net address is what I got as the first hit by
Philip Oakley philipoak...@iee.org writes:
The git(1) man page must be accessed via 'git help git' on Git for Windows
as it has no 'man' command. And it prompts users to read the git(1) page,
rather than hoping they follow a subsidiary link within another
documentation page. The 'tutorial' is
Philip Oakley philipoak...@iee.org writes:
rename deprecated option in preparation for 'git help --guides'.
s/rename/Rename/;
Signed-off-by: Philip Oakley philipoak...@iee.org
---
Hrm, I do not recall anybody ever declared that --all is deprecated.
I do not think we want --all and --all
Philip Oakley philipoak...@iee.org writes:
Logic, but no actions, included.
I am not sure what you mean. Is that to break bisect?
Ahh, you meant command line is parsed but we do not actually show
guides yet, which is done by later patches in this series. OK.
The --all commands option, if
Philip Oakley philipoak...@iee.org writes:
Note that the ability to display an individual guide was
always possible. Include this in the update.
Also tell readers how git(1) can be accessed, especially for
Git for Windows users who do not have the 'man' command.
Likewise include a
Hi!
I was tinkering with a massive git repository (actually a bup
repository, but it is a standard valid git repo underneath). While
validating that a repack ran succesfully I executed the command:
git rev-list --objects --all rev.list
And got back this:
error: packfile
This is the much truncated (was 0/13] and updated series for
noting that 'git help' can display the existing guides that are
formatted as man pages, and providing a 'git help' option to list
a few of the most useful guides.
The series is rebased on top of V1.8.2-rc1
Differences relative to V1
The git(1) man page must be accessed via 'git help git' on Git for Windows
as it has no 'man' command. And it prompts users to read the git(1) page,
rather than hoping they follow a subsidiary link within another
documentation page. The 'tutorial' is an obvious guide to suggest.
Signed-off-by:
Note that the ability to display an individual guide was
always possible. Include this in the update.
Also tell readers how git(1) can be accessed, especially for
Git for Windows users who do not have the 'man' command.
Likewise include a commentary on how to access this page (Catch 22).
rename deprecated option in preparation for 'git help --guides'.
Signed-off-by: Philip Oakley philipoak...@iee.org
---
builtin/help.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/help.c b/builtin/help.c
index d1d7181..d10cbed 100644
--- a/builtin/help.c
+++
Re-use list_common_cmds_help but simply change the array name.
Candidate for future refactoring to pass a pointer to the array.
The common-guides.h list was generated with a simple variant of the
generate-cmdlist.sh and command-list.txt.
Do not list User-manual and Everday Git which not follow
Logic, but no actions, included.
The --all commands option, if given, will display first.
The --guide option's list will then be displayed.
The common commands list is only displayed if neither option,
nor a command or guide name, is given.
Signed-off-by: Philip Oakley philipoak...@iee.org
---
[Sorry if the resend with Cc: crossed over]
From: Junio C Hamano gits...@pobox.com
Sent: Sunday, March 03, 2013 11:38 PM
Subject: Re: [PATCH v2 2/5] Help.c use OPT_COUNTUP
Philip Oakley philipoak...@iee.org writes:
rename deprecated option in preparation for 'git help --guides'.
From: Junio C Hamano gits...@pobox.com
Sent: Sunday, March 03, 2013 11:38 PM
Philip Oakley philipoak...@iee.org writes:
Logic, but no actions, included.
I am not sure what you mean. Is that to break bisect?
Ahh, you meant command line is parsed but we do not actually show
guides yet, which
This reverts commit ba35480439d05b8f6cca50527072194fe3278bbb.
CGit uses these symbols to output the correct HTML around graph
elements. Making these symbols private means that CGit cannot be
updated to use Git 1.8.0 or newer, so let's not do that.
On top of the revert, also add comments so that
Philip Oakley philipoak...@iee.org writes:
Hrm, I do not recall anybody ever declared that --all is deprecated.
No, it was the use OPT_COUNTUP rather than OPT_BOOLEAN that the
deprecated' was refering to.
Oh, no OPT_BOOLEAN was deprecated because too many people rightfully
thought it was
Am 02.03.2013 20:44, schrieb William Entriken:
Previously when using update with recursion, only the path for the
inner-most module was printed. Now the path is printed relative to
the directory the command was started from. This now matches the
behavior of submodule foreach.
Signed-off-by:
From: Junio C Hamano gits...@pobox.com
Sent: Sunday, March 03, 2013 11:39 PM
Philip Oakley philipoak...@iee.org writes:
Note that the ability to display an individual guide was
always possible. Include this in the update.
Also tell readers how git(1) can be accessed, especially for
Git for
Signed-off-by: Jason A. Donenfeld ja...@zx2c4.com
On Sun, Mar 3, 2013 at 7:03 PM, John Keeping j...@keeping.me.uk wrote:
This reverts commit ba35480439d05b8f6cca50527072194fe3278bbb.
CGit uses these symbols to output the correct HTML around graph
elements. Making these symbols private means
From: Junio C Hamano gits...@pobox.com
Sent: Monday, March 04, 2013 12:05 AM
Philip Oakley philipoak...@iee.org writes:
Hrm, I do not recall anybody ever declared that --all is
deprecated.
No, it was the use OPT_COUNTUP rather than OPT_BOOLEAN that the
deprecated' was refering to.
Oh, no
On Mon, Mar 4, 2013 at 1:03 AM, John Keeping j...@keeping.me.uk wrote:
This reverts commit ba35480439d05b8f6cca50527072194fe3278bbb.
CGit uses these symbols to output the correct HTML around graph
elements. Making these symbols private means that CGit cannot be
updated to use Git 1.8.0 or
Jens Lehmann jens.lehm...@web.de writes:
Am 02.03.2013 20:44, schrieb William Entriken:
Previously when using update with recursion, only the path for the
inner-most module was printed. Now the path is printed relative to
the directory the command was started from. This now matches the
Jason A. Donenfeld ja...@zx2c4.com writes:
Signed-off-by: Jason A. Donenfeld ja...@zx2c4.com
I suspect that many people outside CGit circle may not know who this
Jason (who never appeared in git@vger.kernel.org) is, and are
wondering in what capacity he is sending a S-o-b for somebody else's
On Sun, Mar 3, 2013 at 10:42 PM, Junio C Hamano gits...@pobox.com wrote:
I suspect that many people outside CGit circle may not know who this
Jason
That active contributor is Jason. The repository has also been moved
to Jason's http://git.zx2c4.com/cgit/
So, thanks, Jason and John for your
48 matches
Mail list logo
