* maint:
  Start preparing for 1.7.4.4
  pull: do not clobber untracked files on initial pull
  compat: add missing #include <sys/resource.h>

Conflicts:
	RelNotes
This commit is contained in:
Junio C Hamano 2011-04-03 13:53:11 -07:00
Родитель 485cdb9bd8 8e848868ff
Коммит 44bc573436
2 изменённых файлов: 38 добавлений и 0 удалений

Просмотреть файл

@ -0,0 +1,37 @@
Git v1.7.4.4 Release Notes
==========================
Fixes since v1.7.4.3
--------------------
* Compilation of sha1_file.c on BSD platforms were broken due to our
recent use of getrlimit() without including <sys/resource.h>.
* "git config" did not diagnose incorrect configuration variable names.
* "git format-patch" did not wrap a long subject line that resulted from
rfc2047 encoding.
* "git instaweb" should work better again with plackup.
* "git log --max-count=4 -Sfoobar" now shows 4 commits that changes the
number of occurrences of string "foobar"; it used to scan only for 4
commits and then emitted only matching ones.
* "git log --first-parent --boundary $c^..$c" segfaulted on a merge.
* "git pull" into an empty branch should have behaved as if
fast-forwarding from emptiness to the version being pulled, with
the usual protection against overwriting untracked files.
* "git status" spent all the effort to notice racily-clean index entries
but didn't update the index file to help later operations go faster in
some cases.
And other minor fixes and documentation updates.
---
exec >/var/tmp/1
O=v1.7.4.3-22-g8c8674f
echo O=$(git describe maint)
git shortlog --no-merges $O..maint

Просмотреть файл

@ -118,6 +118,7 @@
#endif #endif
#ifndef __MINGW32__ #ifndef __MINGW32__
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/resource.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <termios.h> #include <termios.h>