What's in git.git (Dec 2008, #01; Tue, 02)

What's in git.git (Dec 2008, #01; Tue, 02)

[Junio C Hamano]

We'll probably have 1.6.0.5 by the end of this week.

The tip of the 'master' branch is at 1.6.1-rc1 with a few more fixes.
Hopefully we will have the final 1.6.1 by the end of the year.

* The 'maint' branch has these fixes since the last announcement.

Joey Hess (1):
  sha1_file: avoid bogus "file exists" error message

Johannes Schindelin (1):
  fast-export: use an unsorted string list for extra_refs

Junio C Hamano (1):
  Update draft release notes to 1.6.0.5

Martin Koegler (1):
  git push: Interpret $GIT_DIR/branches in a Cogito compatible way

Matt McCutchen (1):
  git checkout: don't warn about unborn branch if -f is already passed

Miklos Vajna (2):
  Add new testcase to show fast-export does not always exports all tags
  User's Manual: remove duplicated url at the end of Appendix B

Nguyễn Thái Ngọc Duy (1):
  generate-cmdlist.sh: avoid selecting synopsis at wrong place

Pete Wyckoff (1):
  git-p4: fix keyword-expansion regex

Ralf Wildenhues (1):
  Fix typos in the documentation.

SZEDER Gábor (2):
  bash: remove dashed command leftovers
  bash: offer refs instead of filenames for 'git revert'

Sam Vilain (1):
  sha1_file.c: resolve confusion EACCES vs EPERM

Samuel Tardieu (2):
  tag: Check that options are only allowed in the appropriate mode
  tag: Add more tests about mixing incompatible modes and options


* The 'master' branch has these since the last announcement
  in addition to the above.

Alexander Gavrilov (3):
  gitk: Avoid handling the Return key twice in Add Branch
  gitk: Make line origin search update the busy status
  gitk: Add a menu option to start git gui

Cheng Renquan (1):
  git-remote: add verbose mode to git remote update

Christian Couder (4):
  git-gui: french translation update
  bisect: teach "skip" to accept special arguments like "A..B"
  bisect: fix "git bisect skip <commit>" and add tests cases
  Documentation: describe how to "bisect skip" a range of commits

Christian Stimming (1):
  gitk: Update German translation

Giuseppe Bilotta (2):
  gitweb: make gitweb_check_feature a boolean wrapper
  Update comment on gitweb_check/get_feature

Johannes Schindelin (1):
  Document levenshtein.c

Johannes Sixt (2):
  compat/mingw.c: Teach mingw_rename() to replace read-only files
  t4030-diff-textconv: Make octal escape sequence more portable

Junio C Hamano (6):
  gitweb: fix 'ctags' feature check and others
  gitweb: rename gitweb_check_feature to gitweb_get_feature
  send-email: do not reverse the command line arguments
  Include git-gui--askpass in git-gui RPM package
  GIT 1.6.1-rc1
  Makefile: introduce NO_PTHREADS

Linus Torvalds (3):
  Add cache preload facility
  Fix index preloading for racy dirty case
  Add backslash to list of 'crud' characters in real name

Mark Burton (1):
  git-gui: Teach start_push_anywhere_action{} to notice when remote is a
    mirror.

Michele Ballabio (1):
  git gui: update Italian translation

Miklos Vajna (5):
  Update Hungarian translation. 100% completed.
  builtin-clone: use strbuf in guess_dir_name()
  builtin-clone: use strbuf in clone_local() and copy_or_link_directory()
  builtin_clone: use strbuf in cmd_clone()
  git-stash: use git rev-parse -q

Nanako Shiraishi (1):
  git-gui: update Japanese translation

Paul Mackerras (6):
  gitk: Index line[hnd]tag arrays by id rather than row number
  gitk: Fix switch statement in parseviewargs
  gitk: Show local changes properly when we have a path limit
  gitk: Fix context menu items for generating diffs when in tree mode
  gitk: Highlight only when search type is "containing:".
  gitk: Fix bug in accessing undefined "notflag" variable

Peter Krefting (1):
  Updated Swedish translation (514t0f0u).

Pierre Habouzit (4):
  git send-email: make the message file name more specific.
  git send-email: interpret unknown files as revision lists
  git send-email: add --annotate option
  git send-email: ask less questions when --compose is used.

Ralf Wildenhues (1):
  Fix typos in the documentation.

René Scharfe (6):
  add strbuf_expand_dict_cb(), a helper for simple cases
  merge-recursive: use strbuf_expand() instead of interpolate()
  daemon: use strbuf_expand() instead of interpolate()
  daemon: inline fill_in_extra_table_entries()
  daemon: deglobalize variable 'directory'
  remove the unused files interpolate.c and interpolate.h

SZEDER Gábor (1):
  bash: complete full refs

Samuel Tardieu (1):
  Fix deletion of last character in levenshtein distance

Scott Chacon (1):
  Add a built-in alias for 'stage' to the 'add' command

Tuncer Ayaz (2):
  Teach/Fix pull/fetch -q/-v options
  Retain multiple -q/-v occurrences in git pull

"git help stage" doesn't display git-stage man page

[Teemu Likonen]

Junio C Hamano (2008-12-02 22:23 -0800) wrote:

> * The 'master' branch has these since the last announcement
>   in addition to the above.

> Scott Chacon (1):
>   Add a built-in alias for 'stage' to the 'add' command

I think there's a minor user-interface defect:

    $ git help stage
    No manual entry for gitstage

"git stage" is only a built-in alias but at some point it may become the
primary staging command for new Git users and hence a kind of real Git
command. I think "git help stage" should show the git-stage manual page
(even though it only points to git-add(1)).

Re: "git help stage" doesn't display git-stage man page

[Junio C Hamano]

Teemu Likonen <tlikonen@iki.fi> writes:

> Junio C Hamano (2008-12-02 22:23 -0800) wrote:
>
>> * The 'master' branch has these since the last announcement
>>   in addition to the above.
>
>> Scott Chacon (1):
>>   Add a built-in alias for 'stage' to the 'add' command
>
> I think there's a minor user-interface defect:
>
>     $ git help stage
>     No manual entry for gitstage

The patch also breaks the promise made at 1.6.0 that prepending exec path
to $PATH allows you to use the dashed form.

	$ PATH=$(git --exec-path):$PATH
        $ git-stage -p
	xash: git-stage: cmd not found

> "git stage" is only a built-in alias but at some point it may become the
> primary staging command for new Git users and hence a kind of real Git
> command. I think "git help stage" should show the git-stage manual page
> (even though it only points to git-add(1)).

I do not think it would ever be _the_ primary command to add the contents
to the index; we are adding it as a training wheel.

When we had the "staging area" discussion, somehow people ended up with
this notion that you somehow *need to* use the same verb and noun.
I.e. "the index is now explained as the _staging area_.  Why isn't the
command to add contents to the staging area called git-stage?" was the
primary argument that lead to this thinking.

I do not think it adds much value to the system to be dogmatic and insist
that you _have to_ use the same verb and noun.  "You add your changes to
the staging area" is a perfectly natural way to explain what you are doing
and where the "add" in git-add command comes from.  It however is Ok to
allow people to use different spelling (i.e. the verb "stage").

In that sense, I think the intention of the patch to add "stage" as an
additional verb, while clearly marking it as a synonym to the primary
command "add", is aimed at the right place and strikes the right balance.

By the way, I think this should fix it, although it is very late and I
have no time to test it tonight myself.

---

 Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git i/Makefile w/Makefile
index 9577d6f..5158197 100644
--- i/Makefile
+++ w/Makefile
@@ -320,6 +320,7 @@ BUILT_INS += git-merge-subtree$X
 BUILT_INS += git-peek-remote$X
 BUILT_INS += git-repo-config$X
 BUILT_INS += git-show$X
+BUILT_INS += git-stage$X
 BUILT_INS += git-status$X
 BUILT_INS += git-whatchanged$X
 

Re: "git help stage" doesn't display git-stage man page

[Teemu Likonen]

Junio C Hamano (2008-12-03 00:14 -0800) wrote:

> By the way, I think this should fix it, although it is very late and I
> have no time to test it tonight myself.

It does fix it for me. Thanks.


> diff --git i/Makefile w/Makefile
> index 9577d6f..5158197 100644
> --- i/Makefile
> +++ w/Makefile
> @@ -320,6 +320,7 @@ BUILT_INS += git-merge-subtree$X
>  BUILT_INS += git-peek-remote$X
>  BUILT_INS += git-repo-config$X
>  BUILT_INS += git-show$X
> +BUILT_INS += git-stage$X
>  BUILT_INS += git-status$X
>  BUILT_INS += git-whatchanged$X

Re: "git help stage" doesn't display git-stage man page

[Junio C Hamano]

Junio C Hamano <gitster@pobox.com> writes:

> Teemu Likonen <tlikonen@iki.fi> writes:
>
>>> Scott Chacon (1):
>>>   Add a built-in alias for 'stage' to the 'add' command
>>
>> I think there's a minor user-interface defect:
>>
>>     $ git help stage
>>     No manual entry for gitstage
>
> ...
> In that sense, I think the intention of the patch to add "stage" as an
> additional verb, while clearly marking it as a synonym to the primary
> command "add", is aimed at the right place and strikes the right balance.
>
> By the way, I think this should fix it, although it is very late and I
> have no time to test it tonight myself.

Ok, I lied.  I'll go to bed after committing this.

-- >8 --
From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Dec 2008 00:30:34 -0800
Subject: [PATCH] Install git-stage in exec-path

Earlier the plan was to eventually eradicate git-foo executables from the
filesystem for all the built-in commands, but when we released 1.6.0 we
decided not to do so.  Instead, it has been promised that by prepending
the output from $(git --exec-path) to your $PATH, you can keep using the
dashed form of commands.

This also allows "git stage" to appear in the autogenerated command list,
which is used to offer man pages by "git help" command.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index 9577d6f..5158197 100644
--- a/Makefile
+++ b/Makefile
@@ -320,6 +320,7 @@ BUILT_INS += git-merge-subtree$X
 BUILT_INS += git-peek-remote$X
 BUILT_INS += git-repo-config$X
 BUILT_INS += git-show$X
+BUILT_INS += git-stage$X
 BUILT_INS += git-status$X
 BUILT_INS += git-whatchanged$X
 
-- 
1.6.1.rc1.44.g06a3

Re: "git help stage" doesn't display git-stage man page

[Jeff King]

On Wed, Dec 03, 2008 at 12:34:22AM -0800, Junio C Hamano wrote:

> diff --git a/Makefile b/Makefile
> index 9577d6f..5158197 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -320,6 +320,7 @@ BUILT_INS += git-merge-subtree$X
>  BUILT_INS += git-peek-remote$X
>  BUILT_INS += git-repo-config$X
>  BUILT_INS += git-show$X
> +BUILT_INS += git-stage$X
>  BUILT_INS += git-status$X
>  BUILT_INS += git-whatchanged$X

We need this, too, then.

-- >8 --
add stage to gitignore

This is a generated builtin since 24b1f65f (Install git-stage in
exec-path).

Signed-off-by: Jeff King <peff@peff.net>
---
 .gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0c35577..327e660 100644
--- a/.gitignore
+++ b/.gitignore
@@ -118,6 +118,7 @@ git-show
 git-show-branch
 git-show-index
 git-show-ref
+git-stage
 git-stash
 git-status
 git-stripspace
-- 
1.6.1.rc1.309.g51074

Re: "git help stage" doesn't display git-stage man page

[Junio C Hamano]

Jeff King <peff@peff.net> writes:

> On Wed, Dec 03, 2008 at 12:34:22AM -0800, Junio C Hamano wrote:
>
>> diff --git a/Makefile b/Makefile
>> index 9577d6f..5158197 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -320,6 +320,7 @@ BUILT_INS += git-merge-subtree$X
>>  BUILT_INS += git-peek-remote$X
>>  BUILT_INS += git-repo-config$X
>>  BUILT_INS += git-show$X
>> +BUILT_INS += git-stage$X
>>  BUILT_INS += git-status$X
>>  BUILT_INS += git-whatchanged$X
>
> We need this, too, then.

Good catch, thanks.