Skip to content

G
git

李少辉-开发者 / git
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

体验新版 GitCode，发现更多精彩内容 >>

切换分支/标签
  1. 18 2月, 2008 1 次提交
  3. 12 2月, 2008 1 次提交
  5. 07 2月, 2008 1 次提交
    • B
      compat: Add simplified merge sort implementation from glibc · 43fe901b
      由 Brian Downing 提交于 
      qsort in Windows 2000 (and various other C libraries) is a Quicksort
with the usual O(n^2) worst case.  Unfortunately, sorting Git trees
seems to get very close to that worst case quite often:

    $ /git/gitbad runstatus
    # On branch master
    qsort, nmemb = 30842
    done, 237838087 comparisons.

This patch adds a simplified version of the merge sort that is glibc's
qsort(3).  As a merge sort, this needs a temporary array equal in size
to the array that is to be sorted, but has a worst-case performance of
O(n log n).

The complexity that was removed is:

* Doing direct stores for word-size and -aligned data.
* Falling back to quicksort if the allocation required to perform the
  merge sort would likely push the machine into swap.

Even with these simplifications, this seems to outperform the Windows
qsort(3) implementation, even in Windows XP (where it is "fixed" and
doesn't trigger O(n^2) complexity on trees).

[jes: moved into compat/qsort.c, as per Johannes Sixt's suggestion]
[bcd: removed gcc-ism, thanks to Edgar Toernig.  renamed make variable
      per Junio's comment.]
Signed-off-by: NBrian Downing <bdowning@lavos.net>
Signed-off-by: NSteffen Prohaska <prohaska@zib.de>
Signed-off-by: NJohannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      43fe901b
  7. 05 2月, 2008 2 次提交
  9. 27 1月, 2008 1 次提交
  11. 25 1月, 2008 2 次提交
  13. 23 1月, 2008 2 次提交
  15. 19 1月, 2008 1 次提交
    • L
      Move sha1_file_to_archive into libgit · 18125644
      由 Lars Hjemli 提交于 
      When the specfile (export-subst) attribute was introduced, it added a
dependency from archive-{tar|zip}.c to builtin-archive.c. This broke the
support for archive-operations in libgit.a since builtin-archive.o doesn't
belong in libgit.a.

This patch moves the functions required by libgit.a from builtin-archive.c
to the new file archive.c (which becomes part of libgit.a).
Signed-off-by: NLars Hjemli <hjemli@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      18125644
  17. 18 1月, 2008 3 次提交
  19. 15 1月, 2008 1 次提交
    • J
      Fix git-rerere documentation · 11c57e6a
      由 Junio C Hamano 提交于 
      rerere.enabled is _not_ on by default.  The command is enabled if rr-cache
exists even when rerere.enabled is missing, and enabled or disabled by
explicitly setting the rerere.enabled variable.
      11c57e6a
  21. 11 1月, 2008 1 次提交
  23. 09 1月, 2008 1 次提交
  25. 23 12月, 2007 1 次提交
  27. 20 12月, 2007 2 次提交
  29. 17 12月, 2007 1 次提交
  31. 15 12月, 2007 2 次提交
  33. 14 12月, 2007 1 次提交
  35. 11 12月, 2007 1 次提交
  37. 10 12月, 2007 1 次提交
  39. 09 12月, 2007 1 次提交
    • C
      git-help: add -w|--web option to display html man page in a browser. · 5d6491c7
      由 Christian Couder 提交于 
      Now when using "git help -w cmd", we will try to show the HTML man
page "git-cmd.html" in your prefered web browser.

To do that "help.c" code will call a new shell script
"git-browse-help".

This currently works only if the HTML versions of the man page
have been installed in $(htmldir) (typically "/usr/share/doc/git-doc"),
so new target to do that is added to "Documentation/Makefile".

The browser to use can be configured using the "web.browser"
config variable.

We try to open a new tab in an existing web browser, if possible.

The code in "git-browse-help" is heavily stolen from "git-mergetool"
by Theodore Y. Ts'o. Thanks.
Signed-off-by: NChristian Couder <chriscool@tuxfamily.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      5d6491c7
  41. 08 12月, 2007 1 次提交
  43. 07 12月, 2007 1 次提交
    • W
      Silence iconv warnings on Leopard · fe4aafba
      由 Wincent Colaiuta 提交于 
      Apple ships a newer version of iconv with Leopard (Mac OS X 10.5/Darwin
9). Ensure that OLD_ICONV is not set on any version of Darwin in the
9.x series; this should be good for at least a couple of years, when
Darwin 10 comes out and we can invert the sense of the test to
specifically check for Darwin 7 or 8.

A more sophisticated and robust check is possible for those who use
autoconf, but not everybody does that.
Signed-off-by: NWincent Colaiuta <win@wincent.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      fe4aafba
  45. 06 12月, 2007 1 次提交
    • J
      Use gitattributes to define per-path whitespace rule · cf1b7869
      由 Junio C Hamano 提交于 
      The `core.whitespace` configuration variable allows you to define what
`diff` and `apply` should consider whitespace errors for all paths in
the project (See gitlink:git-config[1]).  This attribute gives you finer
control per path.

For example, if you have these in the .gitattributes:

    frotz   whitespace
    nitfol  -whitespace
    xyzzy   whitespace=-trailing

all types of whitespace problems known to git are noticed in path 'frotz'
(i.e. diff shows them in diff.whitespace color, and apply warns about
them), no whitespace problem is noticed in path 'nitfol', and the
default types of whitespace problems except "trailing whitespace" are
noticed for path 'xyzzy'.  A project with mixed Python and C might want
to have:

    *.c    whitespace
    *.py   whitespace=-indent-with-non-tab

in its toplevel .gitattributes file.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      cf1b7869
  47. 05 12月, 2007 1 次提交
  49. 04 12月, 2007 2 次提交
  51. 03 12月, 2007 3 次提交
  53. 02 12月, 2007 2 次提交
  55. 01 12月, 2007 1 次提交
  57. 28 11月, 2007 1 次提交