1GIT v1.6.1 Release Notes 2======================== 3 4Updates since v1.6.0 5-------------------- 6 7When some commands (e.g. "git log", "git diff") spawn pager internally, we 8used to make the pager the parent process of the git command that produces 9output. This meant that the exit status of the whole thing comes from the 10pager, not the underlying git command. We swapped the order of the 11processes around and you will see the exit code from the command from now 12on. 13 14(subsystems) 15 16* gitk can call out to git-gui to view "git blame" output; git-gui in turn 17 can run gitk from its blame view. 18 19* Various git-gui updates including updated translations. 20 21* Various gitweb updates from repo.or.cz installation. 22 23(portability) 24 25* A few test scripts used nonportable "grep" that did not work well on 26 some platforms, e.g. Solaris. 27 28* Sample pre-auto-gc script has OS X support. 29 30(performance) 31 32* The underlying diff machinery to produce textual output has been 33 optimized, which would result in faster "git blame" processing. 34 35* Most of the test scripts (but not the ones that try to run servers) 36 can be run in parallel. 37 38* Bash completion of refnames in a repository with massive number of 39 refs has been optimized. 40 41* Cygwin port uses native stat/lstat implementations when applicable, 42 which leads to improved performance. 43 44* "git push" pays attention to alternate repositories to avoid sending 45 unnecessary objects. 46 47* "git svn" can rebuild an out-of-date rev_map file. 48 49(usability, bells and whistles) 50 51* When you mistype a command name, git helpfully suggests what it guesses 52 you might have meant to say. help.autocorrect configuration can be set 53 to a non-zero value to accept the suggestion when git can uniquely 54 guess. 55 56* "git add -N path..." adds the named paths as an empty blob, so that 57 subsequent "git diff" will show a diff as if they are creation events. 58 59* "git apply" learned --include=paths option, similar to the existing 60 --exclude=paths option. 61 62* "git bisect" is careful about a user mistake and suggests testing of 63 merge base first when good is not a strict ancestor of bad. 64 65* "git blame" re-encodes the commit metainfo to UTF-8 from i18n.commitEncoding 66 by default. 67 68* "git check-attr --stdin" can check attributes for multiple paths. 69 70* "git checkout --track origin/hack" used to be a syntax error. It now 71 DWIMs to create a corresponding local branch "hack", i.e. acts as if you 72 said "git checkout --track -b hack origin/hack". 73 74* "git checkout --ours/--theirs" can be used to check out one side of a 75 conflicting merge during conflict resolution. 76 77* "git checkout -m" can be used to recreate the initial conflicted state 78 during conflict resolution. 79 80* "git cherry-pick" can also utilize rerere for conflict resolution. 81 82* "git clone" learned to be verbose with -v 83 84* "git commit --author=$name" can look up author name from existing 85 commits. 86 87* output from "git commit" has been reworded in a more concise and yet 88 more informative way. 89 90* "git count-objects" reports the on-disk footprint for packfiles and 91 their corresponding idx files. 92 93* "git daemon" learned --max-connections=<count> option. 94 95* "git daemon" exports REMOTE_ADDR to record client address, so that 96 spawned programs can act differently on it. 97 98* "git describe --tags" favours closer lightweight tags than farther 99 annotated tags now. 100 101* "git diff" learned to mimic --suppress-blank-empty from GNU diff via a 102 configuration option. 103 104* "git diff" learned to put more sensible hunk headers for Python, 105 HTML and ObjC contents. 106 107* "git diff" learned to vary the a/ vs b/ prefix depending on what are 108 being compared, controlled by diff.mnemonicprefix configuration. 109 110* "git diff" learned --dirstat-by-file to count changed files, not number 111 of lines, when summarizing the global picture. 112 113* "git diff" hunk header pattern for ObjC has been added. 114 115* a "textconv" filter that makes binary files textual form for human 116 consumption can be specified as an attribute for paths; "git diff" 117 learnt to make use of it. 118 119* "git for-each-ref" learned "refname:short" token that gives an 120 unambiguously abbreviated refname. 121 122* Auto-numbering of the subject lines is the default for "git 123 format-patch" now. 124 125* "git grep" learned to accept -z similar to GNU grep. 126 127* "git help" learned to use GIT_MAN_VIEWER environment variable before 128 using "man" program. 129 130* "git imap-send" can optionally talk SSL. 131 132* "git index-pack" is more careful against disk corruption while 133 completing a thin pack. 134 135* "git log --check" and "git log --exit-code" passes their underlying diff 136 status with their exit status code. 137 138* "git log" learned --simplify-merges, a milder variant of --full-history; 139 "gitk --simplify-merges" is easier to view than with --full-history. 140 141* "git log --pretty=format:" learned "%d" format element that inserts 142 names of tags that point at the commit. 143 144* "git merge --squash" and "git merge --no-ff" into an unborn branch are 145 noticed as user errors. 146 147* "git merge -s $strategy" can use a custom built strategy if you have a 148 command "git-merge-$strategy" on your $PATH. 149 150* "git push" can be told to reject deletion of refs with receive.denyDeletes 151 configuration. 152 153* "git rebase" honours pre-rebase hook; use --no-verify to bypass it. 154 155* "git rebase -p" uses interactive rebase machinery now to preserve the merges. 156 157* "git reflog expire branch" can be used in place of "git reflog expire 158 refs/heads/branch". 159 160* "git remote show $remote" lists remote branches one-per-line now. 161 162* when giving up resolving a conflicted merge, "git reset --hard" failed 163 to remove new paths from the working tree. [cherry-pick to 'maint'?] 164 165* "git submodule foreach" subcommand allows you to iterate over checked 166 out submodules. 167 168* "git submodule sync" subcommands allows you to update the origin URL 169 recorded in submodule directories from the toplevel .gitmodules file. 170 171* "git svn branch" can create new branches on the other end. 172 173* "gitweb" can use more saner PATH_INFO based URL. 174 175(internal) 176 177* "git hash-object" learned to lie about the path being hashed, so that 178 correct gitattributes processing can be done while hashing contents 179 stored in a temporary file. 180 181* various callers of git-merge-recursive avoid forking it as an external 182 process. 183 184* Git class defined in "Git.pm" can be subclasses a bit more easily. 185 186* We used to link GNU regex library as a compatibility layer for some 187 platforms, but it turns out it is not necessary on most of them. 188 189* Some path handling routines used fixed number of buffers used alternately 190 but depending on the call depth, this arrangement led to hard to track 191 bugs. This issue is being addressed. 192 193 194Fixes since v1.6.0 195------------------ 196 197All of the fixes in v1.6.0.X maintenance series are included in this 198release, unless otherwise noted. 199 200* "git add" and "git update-index" incorrectly allowed adding S/F when S 201 is a tracked symlink that points at a directory D that has a path F in 202 it (we still need to fix a similar nonsense when S is a submodule and F 203 is a path in it). 204 205* "git diff --stdin" used to take two trees on a line and compared them, 206 but we dropped support for such a use case long time ago. This has 207 been resurrected. 208 209* Giving 3 or more tree-ish to "git diff" is supposed to show the combined 210 diff from second and subsequent trees to the first one. b75271d ("git 211 diff <tree>{3,}": do not reverse order of arguments, 2008-10-10) needs 212 to be cherry-picked to 'maint'. 213 214* "git filter-branch" failed to rewrite a tag name with slashes in it. 215 216* "git push --tags --all $there" failed with generic usage message without 217 telling saying these two options are incompatible. 218 219* "git log --author/--committer" match used to potentially match the 220 timestamp part, exposing internal implementation detail. Also these did 221 not work with --fixed-strings match at all. 222 223-- 224exec >/var/tmp/1 225O=v1.6.0.3-639-ga1a846a 226echo O=$(git describe master) 227git shortlog --no-merges $O..master ^maint