Skip to content

G
git

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

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

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

切换分支/标签
  1. 15 11月, 2007 6 次提交
    • J
      Merge branch 'np/progress' · 03edb0a7
      由 Junio C Hamano 提交于 
      * np/progress:
  nicer display of thin pack completion
  make display of total transferred fully accurate
  remove dead code from the csum-file interface
  git-fetch: be even quieter.
  make display of total transferred more accurate
  sideband.c: ESC is spelled '\033' not '\e' for portability.
  fix display overlap between remote and local progress
      03edb0a7
    • J
      Merge branch 'js/rebase-detached' · dcb83ec1
      由 Junio C Hamano 提交于 
      * js/rebase-detached:
  rebase: fix "rebase --continue" breakage
  rebase: operate on a detached HEAD
      dcb83ec1
    • J
      Merge branch 'rs/pretty' · 37ec2b4c
      由 Junio C Hamano 提交于 
      * rs/pretty:
  Fix preprocessor logic that determines the availablity of strchrnul().
  Simplify strchrnul() compat code
  --format=pretty: avoid calculating expensive expansions twice
  add strbuf_adddup()
  --pretty=format: parse commit message only once
  --pretty=format: on-demand format expansion
  Add strchrnul()
      37ec2b4c
    • J
      Merge branch 'rr/cvsexportcommit-w' · 43567365
      由 Junio C Hamano 提交于 
      * rr/cvsexportcommit-w:
  cvsexportcommit: Add switch to specify CVS workdir
      43567365
    • J
      Merge branch 'gh/cvsimport-user' · e318f607
      由 Junio C Hamano 提交于 
      * gh/cvsimport-user:
  git-cvsimport: fix handling of user name when it is not set in CVSROOT
      e318f607
    • S
      user-manual: minor rewording for clarity. · 93cbbd71
      由 Sergei Organov 提交于 
      Junio screwed up when applying the previous round of the patch;
rewording from "previous" to "old" does make the description
clearer.

Also revert the rewording from head to branch.  The description
is talking about the branch's tip commit and using the word head
is clearer.

Based on input from Sergei and Bruce.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      93cbbd71
  3. 14 11月, 2007 14 次提交
  5. 13 11月, 2007 3 次提交
  7. 12 11月, 2007 14 次提交
  9. 11 11月, 2007 3 次提交
    • N
      fix index-pack with packs >4GB containing deltas on 32-bit machines · a91ef6e7
      由 Nicolas Pitre 提交于 
      This probably hasn't been properly tested before.  Here's a script to
create a 8GB repo with the necessary characteristics (copy the
test-genrandom executable from the Git build tree to /tmp first):

-----
#!/bin/bash

git init
git config core.compression 0

# create big objects with no deltas
for i in $(seq -w 1 2 63)
do
	echo $i
	/tmp/test-genrandom $i 268435456 > file_$i
	git add file_$i
	rm file_$i
	echo "file_$i -delta" >> .gitattributes
done

# create "deltifiable" objects in between big objects
for i in $(seq -w 2 2 64)
do
	echo "$i $i $i" >> grow
	cp grow file_$i
	git add file_$i
	rm file_$i
done
rm grow

# create a pack with them
git commit -q -m "commit of big objects interlaced with small deltas"
git repack -a -d
-----

Then clone this repo over the Git protocol.
Signed-off-by: NNicolas Pitre <nico@cam.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      a91ef6e7
    • N
      git-hash-object should honor config variables · ff350ccf
      由 Nicolas Pitre 提交于 
      ... such as core.compression.
Signed-off-by: NNicolas Pitre <nico@cam.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      ff350ccf
    • R
      --format=pretty: avoid calculating expensive expansions twice · b9c62321
      由 René Scharfe 提交于 
      As Jeff King remarked, format strings with duplicate placeholders can
be slow to expand, because each instance is calculated anew.

This patch makes use of the fact that format_commit_message() and its
helper functions only ever add stuff to the end of the strbuf.  For
certain expensive placeholders, store the offset and length of their
expansion with the strbuf at the first occurrence.  Later they
expansion result can simply be copied from there -- no malloc() or
strdup() required.

These certain placeholders are the abbreviated commit, tree and
parent hashes, as the search for a unique abbreviated hash is quite
costly.  Here are the times for next (best of three runs):

$ time git log --pretty=format:%h >/dev/null

real    0m0.611s
user    0m0.404s
sys     0m0.204s

$ time git log --pretty=format:%h%h%h%h >/dev/null

real    0m1.206s
user    0m0.744s
sys     0m0.452s

And here those with this patch (and the previous two); the speedup
of the single placeholder case is just noise:

$ time git log --pretty=format:%h >/dev/null

real    0m0.608s
user    0m0.416s
sys     0m0.192s

$ time git log --pretty=format:%h%h%h%h >/dev/null

real    0m0.639s
user    0m0.488s
sys     0m0.140s
Signed-off-by: NRene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      b9c62321