1GIT v1.6.0 Release Notes 2======================== 3 4User visible changes 5-------------------- 6 7With the default Makefile settings, most of the programs are now 8installed outside your $PATH, except for "git", "gitk", "git-gui" and 9some server side programs that need to be accessible for technical 10reasons. Invoking a git subcommand as "git-xyzzy" from the command 11line has been deprecated since early 2006 (and officially announced in 121.5.4 release notes); use of them from your scripts after adding 13output from "git --exec-path" to the $PATH is still supported in this 14release, but users are again strongly encouraged to adjust their 15scripts to use "git xyzzy" form, as we will stop installing 16"git-xyzzy" hardlinks for built-in commands in later releases. 17 18An earlier change to page "git status" output was overwhelmingly unpopular 19and has been reverted. 20 21Source changes needed for porting to MinGW environment are now all in the 22main git.git codebase. 23 24By default, packfiles created with this version uses delta-base-offset 25encoding introduced in v1.4.4. Pack idx files are using version 2 that 26allows larger packs and added robustness thanks to its CRC checking, 27introduced in v1.5.2 and v1.4.4.5. If you want to keep your repositories 28backwards compatible past these versions, set repack.useDeltaBaseOffset 29to false or pack.indexVersion to 1, respectively. 30 31GIT_CONFIG, which was only documented as affecting "git config", but 32actually affected all git commands, now only affects "git config". 33GIT_LOCAL_CONFIG, also only documented as affecting "git config" and 34not different from GIT_CONFIG in a useful way, is removed. 35 36The ".dotest" temporary area "git am" and "git rebase" use is now moved 37inside the $GIT_DIR, to avoid mistakes of adding it to the project by 38accident. 39 40An ancient merge strategy "stupid" has been removed. 41 42 43Updates since v1.5.6 44-------------------- 45 46(subsystems) 47 48* git-p4 in contrib learned "allowSubmit" configuration to control on 49 which branch to allow "submit" subcommand. 50 51* git-gui learned to stage changes per-line. 52 53(portability) 54 55* Changes for MinGW port have been merged, thanks to Johannes Sixt and 56 gangs. 57 58* Sample hook scripts shipped in templates/ are now suffixed with 59 *.sample. We used to prevent them from triggering by default by 60 relying on the fact that we install them as unexecutable, but on 61 some filesystems this approach does not work. Instead of running 62 "chmod +x" on them, the users who want to activate these samples 63 as-is can now rename them dropping *.sample suffix. 64 65* perl's in-place edit (-i) does not work well without backup files on Windows; 66 some tests are rewritten to cope with this. 67 68(documentation) 69 70* Updated howto/update-hook-example 71 72* Got rid of usage of "git-foo" from the tutorial and made typography 73 more consistent. 74 75* Disambiguating "--" between revs and paths is finally documented. 76 77(performance, robustness, sanity etc.) 78 79* index-pack used too much memory when dealing with a deep delta chain. 80 This has been optimized. 81 82* reduced excessive inlining to shrink size of the "git" binary. 83 84* verify-pack checks the object CRC when using version 2 idx files. 85 86* When an object is corrupt in a pack, the object became unusable even 87 when the same object is available in a loose form, We now try harder to 88 fall back to these redundant objects when able. In particular, "git 89 repack -a -f" can be used to fix such a corruption as long as necessary 90 objects are available. 91 92* Performance of "git-blame -C -C" operation is vastly improved. 93 94* git-clone does not create refs in loose form anymore (it behaves as 95 if you immediately ran git-pack-refs after cloning). This will help 96 repositories with insanely large number of refs. 97 98* core.fsyncobjectfiles configuration can be used to ensure that the loose 99 objects created will be fsync'ed (this is only useful on filesystems 100 that does not order data writes properly). 101 102* "git commit-tree" plumbing can make Octopus with more than 16 parents. 103 "git commit" has been capable of this for quite some time. 104 105(usability, bells and whistles) 106 107* even more documentation pages are now accessible via "man" and "git help". 108 109* A new environment variable GIT_CEILING_DIRECTORIES can be used to stop 110 the discovery process of the toplevel of working tree; this may be useful 111 when you are working in a slow network disk and are outside any working tree, 112 as bash-completion and "git help" may still need to run in these places. 113 114* By default, stash entries never expire. Set reflogexpire in [gc 115 "refs/stash"] to a reasonable value to get traditional auto-expiration 116 behaviour back 117 118* Longstanding latency issue with bash completion script has been 119 addressed. This will need to be backmerged to 'maint' later. 120 121* pager.<cmd> configuration variable can be used to enable/disable the 122 default paging behaviour per command. 123 124* "git-add -i" has a new action 'e/dit' to allow you edit the patch hunk 125 manually. 126 127* git-am records the original tip of the branch in ORIG_HEAD before it 128 starts applying patches. 129 130* git-apply can handle a patch that touches the same path more than once 131 much better than before. 132 133* git-apply can be told not to trust the line counts recorded in the input 134 patch but recount, with the new --recount option. 135 136* git-apply can be told to apply a patch to a path deeper than what the 137 patch records with --directory option. 138 139* git-archive can be told to omit certain paths from its output using 140 export-ignore attributes. 141 142* git-archive uses the zlib default compression level when creating 143 zip archive. 144 145* With -v option, git-branch describes the remote tracking statistics 146 similar to the way git-checkout reports by how many commits your branch 147 is ahead/behind. 148 149* git-branch's --contains option used to always require a commit parameter 150 to limit the branches with; it now defaults to list branches that 151 contains HEAD if this parameter is omitted. 152 153* git-branch's --merged and --no-merged option used to always limit the 154 branches relative to the HEAD, but they can now take an optional commit 155 argument that is used in place of HEAD. 156 157* git-bundle can read the revision arguments from the standard input. 158 159* git-cherry-pick can replay a root commit now. 160 161* git-clone can clone from a remote whose URL would be rewritten by 162 configuration stored in $HOME/.gitconfig now. 163 164* git-cvsserver learned to respond to "cvs co -c". 165 166* git-diff --check now checks leftover merge conflict markers. 167 168* When remote side used to have branch 'foo' and git-fetch finds that now 169 it has branch 'foo/bar', it refuses to lose the existing remote tracking 170 branch and its reflog. The error message has been improved to suggest 171 pruning the remote if the user wants to proceed and get the latest set 172 of branches from the remote, including such 'foo/bar'. 173 174* fast-export learned to export and import marks file; this can be used to 175 interface with fast-import incrementally. 176 177* fast-import and fast-export learned to export and import gitlinks. 178 179* git-rebase records the original tip of branch in ORIG_HEAD before it is 180 rewound. 181 182* "git rerere" can be told to update the index with auto-reused resolution 183 with rerere.autoupdate configuration variable. 184 185* git-rev-parse learned $commit^! and $commit^@ notations used in "log" 186 family. These notations are available in gitk as well, because the gitk 187 command internally uses rev-parse to interpret its arguments. 188 189* git-rev-list learned --children option to show child commits it 190 encountered during the traversal, instead of shoing parent commits. 191 192* git-send-mail can talk not just over SSL but over TLS now. 193 194* git-shortlog honors custom output format specified with "--pretty=format:". 195 196* "git-stash save" learned --keep-index option. This lets you stash away the 197 local changes and bring the changes staged in the index to your working 198 tree for examination and testing. 199 200* git-stash also learned branch subcommand to create a new branch out of 201 stashed changes. 202 203* git-status gives the remote tracking statistics similar to the way 204 git-checkout reports by how many commits your branch is ahead/behind. 205 206* "git-svn dcommit" is now aware of auto-props setting the subversion user 207 has. 208 209* You can tell "git status -u" to even more aggressively omit checking 210 untracked files with --untracked-files=no. 211 212* Original SHA-1 value for "update-ref -d" is optional now. 213 214* Error codes from gitweb are made more descriptive where possible, rather 215 than "403 forbidden" as we used to issue everywhere. 216 217(internal) 218 219* git-merge has been reimplemented in C. 220 221 222Fixes since v1.5.6 223------------------ 224 225All of the fixes in v1.5.6 maintenance series are included in 226this release, unless otherwise noted. 227 228* git-clone ignored its -u option; the fix needs to be backported to 229 'maint'; 230 231* git-mv used to lose the distinction between changes that are staged 232 and that are only in the working tree, by staging both in the index 233 after moving such a path. 234 235--- 236exec >/var/tmp/1 237O=v1.6.0-rc0-104-g81dc230 238echo O=$(git describe refs/heads/master) 239git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint