df97e5dfea · matheusbsbs/matheus-bagliano

@@ -4,9 +4,6 @@ Git 2.5 Release Notes

4 Updates since v2.4

5 ------------------

6

7 -Ports

8 -

9 -

7 UI, Workflows & Features

8

9 * The bash completion script (in contrib/) learned a few options that

@@ -28,6 +25,8 @@ UI, Workflows & Features

25 chunks from Perforce, instead of making one call to "p4 changes"

26 that may trigger "too many rows scanned" error from Perforce.

27

28 + * More workaround for Perforce's row number limit in "git p4".

29 +

30 * Unlike "$EDITOR" and "$GIT_EDITOR" that can hold the path to the

31 command and initial options (e.g. "/path/to/emacs -nw"), 'git p4'

32 did not let the shell interpolate the contents of the environment

@@ -47,11 +46,14 @@ UI, Workflows & Features

46 rely on symbolic links and make sharing of objects and refs safer

47 by making the borrowee and borrowers aware of each other.

48

49 + Consider this as still an experimental feature; the UI will likely

50 + to change.

51 +

52 * Tweak the sample "store" backend of the credential helper to honor

53 XDG configuration file locations when specified.

54

53 - * A heuristic to help the "git <cmd> <revs> <pathspec>" command line

54 - convention to catch mistyped paths is to make sure all the non-rev

55 + * A heuristic we use to catch mistyped paths on the command line

56 + "git <cmd> <revs> <pathspec>" is to make sure that all the non-rev

57 parameters in the later part of the command line are names of the

58 files in the working tree, but that means "git grep $str -- \*.c"

59 must always be disambiguated with "--", because nobody sane will

@@ -64,25 +66,18 @@ UI, Workflows & Features

66 that are not marked as "not-for-merge"; this allows us to lose an

67 old style invocation "git merge <msg> HEAD $commits..." in the

68 implementation of "git pull" script; the old style syntax can now

67 - be deprecated.

68 -

69 - * Help us to find broken test script that splits the body part of the

70 - test by mistaken use of wrong kind of quotes.

71 - (merge d93d5d5 jc/test-prereq-validate later to maint).

72 -

73 - * Developer support to automatically detect broken &&-chain in the

74 - test scripts is now turned on by default.

75 - (merge 92b269f jk/test-chain-lint later to maint).

69 + be deprecated (but not removed yet).

70

71 * Filter scripts were run with SIGPIPE disabled on the Git side,

72 expecting that they may not read what Git feeds them to filter.

73 We however treated a filter that does not read its input fully

80 - before exiting as an error.

74 + before exiting as an error. We no longer do and ignore EPIPE

75 + when writing to feed the filter scripts.

76

77 This changes semantics, but arguably in a good way. If a filter

83 - can produce its output without consuming its input using whatever

84 - magic, we now let it do so, instead of diagnosing it as a

85 - programming error.

78 + can produce its output without fully consuming its input using

79 + whatever magic, we now let it do so, instead of diagnosing it

80 + as a programming error.

81

82 * Instead of dying immediately upon failing to obtain a lock, the

83 locking (of refs etc) retries after a short while with backoff.

@@ -98,8 +93,8 @@ UI, Workflows & Features

93 when pushing, but the documentation and help text pretended as if

94 it did.

95

101 - * The Git subcommand completion (in contrib/) listed credential

102 - helpers among candidates, which is not something the end user would

96 + * The Git subcommand completion (in contrib/) no longer lists credential

97 + helpers among candidates; they are not something the end user would

98 invoke interactively.

99

100 * The index file can be taught with "update-index --untracked-cache"

@@ -120,8 +115,41 @@ UI, Workflows & Features

115 behaves as if HEAD:Documentation/RelNotes/2.5.0.txt was given as

116 input instead.

117

118 + Consider this as still an experimental and incomplete feature:

119 +

120 + - We may want to do the same for in-index objects, e.g.

121 + asking for :RelNotes with this option should give

122 + :Documentation/RelNotes/2.5.0.txt, too

123 +

124 + - "git cat-file --follow-symlinks blob HEAD:RelNotes"

125 + may also be something we want to allow in the future.

126 +

127 * "git send-email" learned the alias file format used by the sendmail

124 - program (in an abbreviated form).

128 + program (in a simplified form; we obviously do not feed pipes).

129 +

130 + * "git am" learned am.threeWay configuration variable.

131 +

132 + * Traditionally, external low-level 3-way merge drivers are expected

133 + to produce their results based solely on the contents of the three

134 + variants given in temporary files named by %O, %A and %B on their

135 + command line. Additionally allow them to look at the final path

136 + (given by %P).

137 +

138 + * "git blame" learned blame.showEmail configuration variable.

139 +

140 + * "git apply" cannot diagnose a patch corruption when the breakage is

141 + to mark the length of the hunk shorter than it really is on the

142 + hunk header line "@@ -l,k +m,n @@"; one special case it could is

143 + when the hunk becomes no-op (e.g. k == n == 2 for two-line context

144 + patch output), and it learned to do so in this special case.

145 +

146 + * Add the "--allow-unknown-type" option to "cat-file" to allow

147 + inspecting loose objects of an experimental or a broken type.

148 +

149 + * Many long-running operations show progress eye-candy, even when

150 + they are later backgrounded. Hide the eye-candy when the process

151 + is sent to the background instead.

152 + (merge 9a9a41d lm/squelch-bg-progress later to maint).

153

154

155 Performance, Internal Implementation, Development Support etc.

@@ -132,9 +160,11 @@ Performance, Internal Implementation, Development Support etc.

160 but hopefully will give us one extra level of abstraction in the

161 end, when completed.

162

163 + * for_each_ref() callback functions were taught to name the objects

164 + not with "unsigned char sha1[20]" but with "struct object_id".

165 +

166 * Catch a programmer mistake to feed a pointer not an array to

167 ARRAY_SIZE() macro, by using a couple of GCC extensions.

137 - (merge 89c855e ep/do-not-feed-a-pointer-to-array-size later to maint).

168

169 * Some error messages in "git config" were emitted without calling

170 the usual error() facility.

@@ -152,33 +182,34 @@ Performance, Internal Implementation, Development Support etc.

182

183 * An earlier rewrite to use strbuf_getwholeline() instead of fgets(3)

184 to read packed-refs file revealed that the former is unacceptably

155 - inefficient.

185 + inefficient. It has been optimized by using getdelim(3) when

186 + available.

187

188 * The refs API uses ref_lock struct which had its own "int fd", even

189 though the same file descriptor was in the lock struct it contains.

190 Clean-up the code to lose this redundant field.

191

161 - * Add the "--allow-unknown-type" option to "cat-file" to allow

162 - inspecting loose objects of an experimental or a broken type.

163 -

164 - * Many long-running operations show progress eye-candy, even when

165 - they are later backgrounded. Hide the eye-candy when the process

166 - is sent to the background instead.

167 - (merge 9a9a41d lm/squelch-bg-progress later to maint).

168 -

192 * There was a dead code that used to handle "git pull --tags" and

193 show special-cased error message, which was made irrelevant when

194 the semantics of the option changed back in Git 1.9 days.

195 (merge 19d122b pt/pull-tags-error-diag later to maint).

196

174 - * for_each_ref() callback functions were taught to name the objects

175 - not with "unsigned char sha1[20]" but with "struct object_id".

197 + * Help us to find broken test script that splits the body part of the

198 + test by mistaken use of wrong kind of quotes.

199 + (merge d93d5d5 jc/test-prereq-validate later to maint).

200 +

201 + * Developer support to automatically detect broken &&-chain in the

202 + test scripts is now turned on by default.

203 + (merge 92b269f jk/test-chain-lint later to maint).

204

205 * Error reporting mechanism used in "refs" API has been made more

206 consistent.

207

208 * "git pull" has more test coverage now.

209

210 + * "git pull" has become more aware of the options meant for

211 + underlying "git fetch" and then learned to use parse-options

212 + parser.

213

214 Also contains various documentation updates and code clean-ups.

215

@@ -289,12 +320,6 @@ notes for details).

320 anywhere in the path (e.g. "/home/me/bin/uplink/ssh").

321 (merge baaf233 bc/connect-plink later to maint).

322

292 - * "git stash pop/apply" forgot to make sure that not just the working

293 - tree is clean but also the index is clean. The latter is important

294 - as a stash application can conflict and the index will be used for

295 - conflict resolution.

296 - (merge ed178ef jk/stash-require-clean-index later to maint).

297 -

323 * We have prepended $GIT_EXEC_PATH and the path "git" is installed in

324 (typically "/usr/bin") to $PATH when invoking subprograms and hooks

325 for almost eternity, but the original use case the latter tried to

@@ -422,6 +447,39 @@ notes for details).

447 inconsistently, even for commands that do not need working tree.

448 (merge fada767 jk/die-on-bogus-worktree-late later to maint).

449

450 + * Recent Mac OS X updates breaks the logic to detect that the machine

451 + is on the AC power in the sample pre-auto-gc script.

452 + (merge c54c7b3 pa/auto-gc-mac-osx later to maint).

453 +

454 + * "git commit --cleanup=scissors" was not careful enough to protect

455 + against getting fooled by a line that looked like scissors.

456 + (merge fbfa097 sg/commit-cleanup-scissors later to maint).

457 +

458 + * "Have we lost a race with competing repack?" check was too

459 + expensive, especially while receiving a huge object transfer

460 + that runs index-pack (e.g. "clone" or "fetch").

461 + (merge 0eeb077 jk/index-pack-reduce-recheck later to maint).

462 +

463 + * The tcsh completion writes a bash scriptlet but that would have

464 + failed for users with noclobber set.

465 + (merge 0b1f688 af/tcsh-completion-noclobber later to maint).

466 +

467 + * "git for-each-ref" reported "missing object" for 0{40} when it

468 + encounters a broken ref. The lack of object whose name is 0{40} is

469 + not the problem; the ref being broken is.

470 + (merge 501cf47 mh/reporting-broken-refs-from-for-each-ref later to maint).

471 +

472 + * Various fixes around "git am" that applies a patch to a history

473 + that is not there yet.

474 + (merge 6ea3b67 pt/am-abort-fix later to maint).

475 +

476 + * "git fsck" used to ignore missing or invalid objects recorded in reflog.

477 + (merge 19bf6c9 mh/fsck-reflog-entries later to maint).

478 +

479 + * "git format-patch --ignore-if-upstream A..B" did not like to be fed

480 + tags as boundary commits.

481 + (merge 9b7a61d jc/do-not-feed-tags-to-clear-commit-marks later to maint).

482 +

483 * Code cleanups and documentation updates.

484 (merge 0269f96 mm/usage-log-l-can-take-regex later to maint).

485 (merge 64f2589 nd/t1509-chroot-test later to maint).

@@ -443,3 +501,8 @@ notes for details).

501 (merge 055c7e9 sb/pack-protocol-mention-smart-http later to maint).

502 (merge 7c37a5d jk/make-fix-dependencies later to maint).

503 (merge fc0aa39 sg/merge-summary-config later to maint).

504 + (merge 329af6c pt/t0302-needs-sanity later to maint).

505 + (merge d614f07 fk/doc-format-patch-vn later to maint).

506 + (merge 72dbb36 sg/completion-commit-cleanup later to maint).

507 + (merge e654eb2 es/utf8-stupid-compiler-workaround later to maint).

508 + (merge 34b935c es/osx-header-pollutes-mask-macro later to maint).

Ninth batch for 2.5