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