global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-18 13:49:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  Start merging the sixth batch for 1.8.0
  Further merging in preparation for 1.7.12.1
  gitk: Rename 'tagcontents' to 'cached_tagcontent'
  gitk: Teach "Reread references" to reload tags
  gitk: Fix GIT_TRACE issues
  gitk: Avoid Meta1-F5
This commit is contained in:
Junio C Hamano
2012-09-12 14:37:36 -07:00
parent 3d3ef136b7 6b149cee20
commit f84a1e5b89
3 changed files with 58 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Documentation/RelNotes/1.7.12.1.txt
View File

@@ -14,6 +14,11 @@ Fixes since v1.7.12
subcommands can be abbreviated to the unique prefix, but it was not
easy to find it described for new readers of the documentation set.
* The synopsis said "checkout [-B branch]" to make it clear the
branch name is a parameter to the option, but the heading for the
option description was "-B::", not "-B branch::", making the
documentation misleading.
* The "--topo-order", "--date-order" (and the lack of either means
the default order) options to "rev-list" and "log" family of
commands were poorly described in the documentation.
@@ -36,6 +41,14 @@ Fixes since v1.7.12
* Fallback 'getpass' implementation made unportable use of stdio API.
* "git apply -p0" did not parse pathnames on "diff --git" line
correctly. This caused patches that had pathnames in no other
places to be mistakenly rejected (most notably, binary patch that
does not rename nor change mode). Textual patches, renames or mode
changes have preimage and postimage pathnames in different places
in a form that can be parsed unambiguously and did not suffer from
this problem.
* "git commit --amend" let the user edit the log message and then
died when the human-readable committer name was given
insufficiently by getpwent(3).
@@ -44,9 +57,22 @@ Fixes since v1.7.12
did not advertise that they are available. fetch-pack has been
fixed not to do so.
* "git for-each-ref" did not currectly support more than one --sort
option.
* "git log .." errored out saying it is both rev range and a path
when there is no disambiguating "--" is on the command line.
Update the command line parser to interpret ".." as a path in such
a case.
* "git prune" without "-v" used to warn about leftover temporary
files (which is an indication of an earlier aborted operation).
* Pushing to smart HTTP server with recent Git fails without having
the username in the URL to force authentication, if the server is
configured to allow GET anonymously, while requiring authentication
for POST.
* The reflog entries left by "git rebase" and "git rebase -i" were
inconsistent (the interactive one gave an abbreviated object name).

51
Documentation/RelNotes/1.8.0.txt
View File

@@ -59,6 +59,7 @@ Foreign Interface
* "git svn" has been updated to work with SVN 1.7.
Performance, Internal Implementation, etc. (please report possible regressions)
* Git ships with a fall-back regexp implementation for platforms with
@@ -75,6 +76,9 @@ Performance, Internal Implementation, etc. (please report possible regressions)
* Compatibility wrapper around some mkdir(2) implementations that
reject parameter with trailing slash has been introduced.
* Compatibility wrapper for systems that lack usable setitimer() has
been added.
* Many internal uses of "git merge-base" equivalent were only to see
if one commit fast-forwards to the other, which did not need the
full set of merge bases to be computed. They have been updated to
@@ -87,6 +91,7 @@ Performance, Internal Implementation, etc. (please report possible regressions)
* Messages given by "git <subcommand> -h" from many subcommands have
been marked for translation.
Also contains minor documentation updates and code clean-ups.
@@ -97,6 +102,18 @@ Unless otherwise noted, all the fixes since v1.7.12 in the
maintenance track are contained in this release (see release notes
to them for details).
* The subcommand in "git remote" to remove a defined remote was
"rm" and the command did not take a fully-spelled "remove".
(merge e17dba8 nd/maint-remote-remove later to maint).
* After "gitk" showed the contents of a tag, neither "Reread
references" nor "Reload" did not update what is shown as the
contents of it, when the user overwrote the tag with "git tag -f".
* "git cvsimport" did not thoroughly cleanse tag names that it
inferred from the names of the tags it obtained from CVS, which
caused "git tag" to barf and stop the import in the middle.
* "git show --format='%ci'" did not give timestamp correctly for
commits created without human readable name on "committer" line.
(merge e27ddb6 jc/maint-ident-missing-human-name later to maint).
@@ -120,46 +137,14 @@ to them for details).
branches were counting in bytes, not in display columns.
(merge 1452bd6 nd/branch-v-alignment later to maint).
* "git for-each-ref" did not currectly support more than one --sort
option.
(merge 3b51222 kk/maint-for-each-ref-multi-sort later to maint).
* Pushing to smart HTTP server with recent Git fails without having
the username in the URL to force authentication, if the server is
configured to allow GET anonymously, while requiring authentication
for POST.
(merge b81401c jk/maint-http-half-auth-push later to maint).
* When looking for $HOME/.gitconfig etc., it is OK if we cannot read
them because they do not exist, but we did not diagnose existing
files that we cannot read.
* The synopsis said "checkout [-B branch]" to make it clear the
branch name is a parameter to the option, but the heading for the
option description was "-B::", not "-B branch::", making the
documentation misleading. There may be room in documentation pages
of other commands for similar improvements (hint, hint).
(merge 45aaf03 jc/maint-doc-checkout-b-always-takes-branch-name later to maint).
* "git log .." errored out saying it is both rev range and a path
when there is no disambiguating "--" is on the command line.
Update the command line parser to interpret ".." as a path in such
a case.
(merge 003c84f jc/dotdot-is-parent-directory later to maint).
* "git apply -p0" did not parse pathnames on "diff --git" line
correctly. This caused patches that had pathnames in no other
places to be mistakenly rejected (most notably, binary patch that
does not rename nor change mode). Textual patches, renames or mode
changes have preimage and postimage pathnames in different places
in a form that can be parsed unambiguously and did not suffer from
this problem.
(merge 6a2abdc jc/apply-binary-p0 later to maint).
* The interactive prompt "git send-email" gives was error prone. It
asked "What e-mail address do you want to use?" with the address it
guessed (correctly) the user would want to use in its prompt,
tempting the user to say "y". But the response was taken as "No,
please use 'y' as the e-mail address instead", which is most
certainly not what the user meant.
(merge 51bbccf jc/send-email-reconfirm later to maint).
(merge 6183749 sb/send-email-reconfirm-fix later to maint).

22
gitk-git/gitk
View File

@@ -2038,7 +2038,7 @@ proc makewindow {} {
set file {
mc "File" cascade {
{mc "Update" command updatecommits -accelerator F5}
{mc "Reload" command reloadcommits -accelerator Meta1-F5}
{mc "Reload" command reloadcommits -accelerator Shift-F5}
{mc "Reread references" command rereadrefs}
{mc "List references" command showrefs -accelerator F2}
{xx "" separator}
@@ -2495,7 +2495,7 @@ proc makewindow {} {
bindkey ? {dofind -1 1}
bindkey f nextfile
bind . <F5> updatecommits
bind . <$M1B-F5> reloadcommits
bind . <Shift-F5> reloadcommits
bind . <F2> showrefs
bind . <Shift-F4> {newview 0}
catch { bind . <Shift-Key-XF86_Switch_VT_4> {newview 0} }
@@ -10599,7 +10599,7 @@ proc movedhead {hid head} {
}
proc changedrefs {} {
global cached_dheads cached_dtags cached_atags
global cached_dheads cached_dtags cached_atags cached_tagcontent
global arctags archeads arcnos arcout idheads idtags
foreach id [concat [array names idheads] [array names idtags]] {
@@ -10611,6 +10611,7 @@ proc changedrefs {} {
}
}
}
catch {unset cached_tagcontent}
catch {unset cached_dtags}
catch {unset cached_atags}
catch {unset cached_dheads}
@@ -10663,7 +10664,7 @@ proc listrefs {id} {
}
proc showtag {tag isnew} {
global ctext tagcontents tagids linknum tagobjid
global ctext cached_tagcontent tagids linknum tagobjid
if {$isnew} {
addtohistory [list showtag $tag 0] savectextpos
@@ -10672,13 +10673,13 @@ proc showtag {tag isnew} {
clear_ctext
settabs 0
set linknum 0
if {![info exists tagcontents($tag)]} {
if {![info exists cached_tagcontent($tag)]} {
catch {
set tagcontents($tag) [exec git cat-file tag $tag]
set cached_tagcontent($tag) [exec git cat-file tag $tag]
}
}
if {[info exists tagcontents($tag)]} {
set text $tagcontents($tag)
if {[info exists cached_tagcontent($tag)]} {
set text $cached_tagcontent($tag)
} else {
set text "[mc "Tag"]: $tag\n[mc "Id"]: $tagids($tag)"
}
@@ -11532,6 +11533,11 @@ if {[catch {package require Tk 8.4} err]} {
exit 1
}
# Unset GIT_TRACE var if set
if { [info exists ::env(GIT_TRACE)] } {
unset ::env(GIT_TRACE)
}
# defaults...
set wrcomcmd "git diff-tree --stdin -p --pretty"