Documentation / RelNotes / 1.8.2.txton commit git-merge(1): document diff-algorithm option to merge-recursive (4db4f0f)
   1Git v1.8.2 Release Notes
   2========================
   3
   4Backward compatibility notes
   5----------------------------
   6
   7In the upcoming major release (tentatively called 1.8.2), we will
   8change the behavior of the "git push" command.
   9
  10When "git push [$there]" does not say what to push, we have used the
  11traditional "matching" semantics so far (all your branches were sent
  12to the remote as long as there already are branches of the same name
  13over there).  We will use the "simple" semantics that pushes the
  14current branch to the branch with the same name, only when the current
  15branch is set to integrate with that remote branch.  There is a user
  16preference configuration variable "push.default" to change this.
  17
  18
  19Updates since v1.8.1
  20--------------------
  21
  22UI, Workflows & Features
  23
  24 * Initial ports to QNX and z/OS UNIX System Services have started.
  25
  26 * Output from the tests is coloured using "green is okay, yellow is
  27   questionable, red is bad and blue is informative" scheme.
  28
  29 * In bare repositories, "git shortlog" and other commands now read
  30   mailmap files from the tip of the history, to help running these
  31   tools in server settings.
  32
  33 * Color specifiers, e.g. "%C(blue)Hello%C(reset)", used in the
  34   "--format=" option of "git log" and friends can be disabled when
  35   the output is not sent to a terminal by prefixing them with
  36   "auto,", e.g. "%C(auto,blue)Hello%C(auto,reset)".
  37
  38 * Scripts can ask Git that wildcard patterns in pathspecs they give do
  39   not have any significance, i.e. take them as literal strings.
  40
  41 * The pathspec code learned to grok "foo/**/bar" as a pattern that
  42   matches "bar" in 0-or-more levels of subdirectory in "foo".
  43
  44 * "git cherry-pick" can be used to replay a root commit to an unborn
  45   branch.
  46
  47 * "git fetch --mirror" and fetch that uses other forms of refspec
  48   with wildcard used to attempt to update a symbolic ref that match
  49   the wildcard on the receiving end, which made little sense (the
  50   real ref that is pointed at by the symbolic ref would be updated
  51   anyway).  Symbolic refs no longer are affected by such a fetch.
  52
  53 * "git format-patch" now detects more cases in which a whole branch
  54   is being exported, and uses the description for the branch, when
  55   asked to write a cover letter for the series.
  56
  57 * "git format-patch" learned "-v $count" option, and prepends a
  58   string "v$count-" to the names of its output files, and also
  59   automatically sets the subject prefix to "PATCH v$count". This
  60   allows patches from rerolled series to be stored under different
  61   names and makes it easier to reuse cover letter messsages.
  62
  63 * "git push" now requires "-f" to update a tag, even if it is a
  64   fast-forward, as tags are meant to be fixed points.
  65
  66 * When "git rebase" fails to generate patches to be applied (e.g. due
  67   to oom), it failed to detect the failure and instead behaved as if
  68   there were nothing to do.  A workaround to use a temporary file has
  69   been applied, but we probably would want to revisit this later, as
  70   it hurts the common case of not failing at all.
  71
  72 * "git submodule" started learning a new mode to integrate with the
  73   tip of the remote branch (as opposed to integrating with the commit
  74   recorded in the superproject's gitlink).
  75
  76
  77Foreign Interface
  78
  79 * "git fast-export" has been updated for its use in the context of
  80   the remote helper interface.
  81
  82 * A new remote helper to interact with bzr has been added to contrib/.
  83
  84
  85Performance, Internal Implementation, etc.
  86
  87 * "git fsck" has been taught to be pickier about entries in tree
  88   objects that should not be there, e.g. ".", ".git", and "..".
  89
  90 * Matching paths with common forms of pathspecs that contain wildcard
  91   characters has been optimized further.
  92
  93 * The implementation of "imap-send" has been updated to reuse xml
  94   quoting code from http-push codepath.
  95
  96 * There is a simple-minded checker for the test scripts in t/
  97   directory to catch most common mistakes (it is not enabled by
  98   default).
  99
 100
 101Also contains minor documentation updates and code clean-ups.
 102
 103
 104Fixes since v1.8.1
 105------------------
 106
 107Unless otherwise noted, all the fixes since v1.8.1 in the maintenance
 108track are contained in this release (see release notes to them for
 109details).
 110
 111 * An element on GIT_CEILING_DIRECTORIES list that does not name the
 112   real path to a directory (i.e. a symbolic link) could have caused
 113   the GIT_DIR discovery logic to escape the ceiling.
 114   (merge 059b379 mh/ceiling later to maint).
 115
 116 * When attempting to read the XDG-style $HOME/.config/git/config and
 117   finding that $HOME/.config/git is a file, we gave a wrong error
 118   message, instead of treating the case as "a custom config file does
 119   not exist there" and moving on.
 120   (merge 8f2bbe4 jn/warn-on-inaccessible-loosen later to maint).
 121
 122 * The behaviour visible to the end users was confusing, when they
 123   attempt to kill a process spawned in the editor that was in turn
 124   launched by Git with SIGINT (or SIGQUIT), as Git would catch that
 125   signal and die.  We ignore these signals now.
 126   (merge 1250857 pf/editor-ignore-sigint later to maint).
 127
 128 * A child process that was killed by a signal (e.g. SIGINT) was
 129   reported in an inconsistent way depending on how the process was
 130   spawned by us, with or without a shell in between.
 131   (merge 709ca73 jk/unify-exit-code-by-receiving-signal later to maint).
 132
 133 * After failing to create a temporary file using mkstemp(), failing
 134   pathname was not reported correctly on some platforms.
 135   (merge f7be59b jc/mkstemp-more-careful-error-reporting later to maint).
 136
 137 * The attribute mechanism didn't allow limiting attributes to be
 138   applied to only a single directory itself with "path/" like the
 139   exclude mechanism does.
 140   (merge 94bc671 ja/directory-attrs later to maint).
 141
 142 * "git apply" misbehaved when fixing whitespace breakages by removing
 143   excess trailing blank lines.
 144   (merge 5de7166 jc/apply-trailing-blank-removal later to maint).
 145
 146 * A tar archive created by "git archive" recorded a directory in a
 147   way that made NetBSD's implementation of "tar" sometimes unhappy.
 148   (merge 22f0dcd rs/leave-base-name-in-name-field-of-tar later to maint).
 149
 150 * "git archive" did not record uncompressed size in the header when
 151   streaming a zip archive, which confused some implementations of unzip.
 152   (merge 5ea2c84 rs/zip-with-uncompressed-size-in-the-header later to maint).
 153
 154 * When "git clone --separate-git-dir=$over_there" is interrupted, it
 155   failed to remove the real location of the $GIT_DIR it created.
 156   This was most visible when interrupting a submodule update.
 157   (merge 9be1980 jl/interrupt-clone-remove-separate-git-dir later to maint).
 158
 159 * The way "git svn" asked for password using SSH_ASKPASS and
 160   GIT_ASKPASS was not in line with the rest of the system.
 161   (merge e9263e4 ss/svn-prompt later to maint).
 162
 163 * The --graph code fell into infinite loop when asked to do what the
 164   code did not expect.
 165   (merge 656197a mk/maint-graph-infinity-loop later to maint).
 166
 167 * http transport was wrong to ask for the username when the
 168   authentication is done by certificate identity.
 169   (merge 75e9a40 rb/http-cert-cred-no-username-prompt later to maint).
 170
 171 * "git pack-refs" that ran in parallel to another process that
 172   created new refs had a nasty race.
 173   (merge b3f1280 jk/repack-ref-racefix later to maint).
 174
 175 * After "git add -N" and then writing a tree object out of the
 176   index, the cache-tree data structure got corrupted.
 177   (merge eec3e7e nd/invalidate-i-t-a-cache-tree later to maint).
 178
 179 * "git merge --no-edit" computed who were involved in the work done
 180   on the side branch, even though that information is to be discarded
 181   without getting seen in the editor.
 182   (merge 9bcbb1c jc/maint-fmt-merge-msg-no-edit-lose-credit later to maint).
 183
 184 * "git merge" started calling prepare-commit-msg hook like "git
 185   commit" does some time ago, but forgot to pay attention to the exit
 186   status of the hook.
 187   (merge 3e4141d ap/merge-stop-at-prepare-commit-msg-failure later to maint).
 188
 189 * "gitweb", when sorting by age to show repositories with new
 190   activities first, used to sort repositories with absolutely
 191   nothing in it early, which was not very useful.
 192   (merge 28dae18 md/gitweb-sort-by-age later to maint).
 193
 194 * "gitweb"'s code to sanitize control characters before passing it to
 195   "highlight" filter lost known-to-be-safe control characters by
 196   mistake.
 197   (merge 0e901d2 os/gitweb-highlight-uncaptured later to maint).
 198
 199 * When a line to be wrapped has a solid run of non space characters
 200   whose length exactly is the wrap width, "git shortlog -w" failed
 201   to add a newline after such a line.
 202   (merge e0db176 sp/shortlog-missing-lf later to maint).
 203
 204 * Some shells do not behave correctly when IFS is unset; work it
 205   around by explicitly setting it to the default value.
 206   (merge 393050c jc/maint-fbsd-sh-ifs-workaround later to maint).
 207
 208 * Some scripted programs written in Python did not get updated when
 209   PYTHON_PATH changed.
 210   (cherry-pick 96a4647fca54031974cd6ad1 later to maint).
 211
 212 * When autoconf is used, any build on a different commit always ran
 213   "config.status --recheck" even when unnecessary.
 214   (merge 1226504 jn/less-reconfigure later to maint).
 215
 216 * We have been carrying a translated and long-unmaintained copy of an
 217   old version of the tutorial; removed.
 218   (merge 0a85441 ta/remove-stale-translated-tut later to maint).
 219
 220 * t4014, t9502 and t0200 tests had various portability issues that
 221   broke on OpenBSD.
 222   (merge 27f6342 jc/maint-test-portability later to maint).
 223
 224 * t9020 and t3600 tests had various portability issues.
 225   (merge 5a02966 jc/test-portability later to maint).
 226
 227 * t9200 runs "cvs init" on a directory that already exists, but a
 228   platform can configure this fail for the current user (e.g. you
 229   need to be in the cvsadmin group on NetBSD 6.0).
 230   (merge 8666df0 jc/test-cvs-no-init-in-existing-dir later to maint).
 231
 232 * t9020 and t9810 had a few non-portable shell script construct.
 233   (merge 2797914 tb/test-t9020-no-which later to maint).
 234   (merge 6f4e505 tb/test-t9810-no-sed-i later to maint).