Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* maint:
  Update draft release notes to 1.6.0.5
  generate-cmdlist.sh: avoid selecting synopsis at wrong place
  • Loading branch information
Junio C Hamano committed Dec 1, 2008
2 parents d5cbdba + 5359fde commit 7f871c6
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
22 changes: 22 additions & 0 deletions Documentation/RelNotes-1.6.0.5.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,34 @@ Fixes since v1.6.0.4
* 'git checkout' from an un-checked-out state did not allow switching out
of the current branch.

* 'git diff' always allowed GIT_EXTERNAL_DIFF and --no-ext-diff was no-op for
the command.

* 'git fast-export' did not export all tags.

* 'git ls-files --with-tree=<tree>' did not work with options other
than -c, most notably with -m.

* 'git pack-objects' did not make its best effort to honor --max-pack-size
option when a single first object already busted the given limit and
placed many objects in a single pack.

* 'git-p4' fast import frontend was too eager to trigger its keyword expansion
logic, even on a keyword-looking string that does not have closing '$' on the
same line.

* 'git push $there' when the remote $there is defined in $GIT_DIR/branches/$there
behaves more like what cg-push from Cogito used to work.

* 'git tag' did not complain when given mutually incompatible set of options.

* 'make check' cannot be run without sparse; people may have meant to say
'make test' instead, so suggest that.

* Many unsafe call to sprintf() style varargs functions are corrected.

* Also contains quite a few documentation updates.

--
O=v1.6.0.4-39-g27f6496

2 changes: 1 addition & 1 deletion generate-cmdlist.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ sort |
while read cmd
do
sed -n '
/NAME/,/git-'"$cmd"'/H
/^NAME/,/git-'"$cmd"'/H
${
x
s/.*git-'"$cmd"' - \(.*\)/ {"'"$cmd"'", "\1"},/
Expand Down

0 comments on commit 7f871c6

Please sign in to comment.