Skip to content

G
git

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

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

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

切换分支/标签
  1. 19 7月, 2007 5 次提交
    • L
      Do a better job at guessing unknown character sets · b59d398b
      由 Linus Torvalds 提交于 
      At least in the kernel development community, we're generally slowly
converting to UTF-8 everywhere, and the old default of Latin1 in emails is
being supplanted by UTF-8, and it doesn't necessarily show up as such in
the mail headers (because, quite frankly, when people send patches
around, they want the email client to do as little as humanly possible
about the patch)

Despite that, it's often the case that email addresses etc still have
Latin1, so I've seen emails where this is a mixed bag, with Signed-off
parts being copied from email (and containing Latin1 characters), and the
rest of the email being a patch in UTF-8.

So this suggests a very natural change: if the target character set is
utf-8 (the default), and if the source already looks like utf-8, just
assume that it doesn't need any conversion at all.

Only assume that it needs conversion if it isn't already valid utf-8, in
which case we (for historical reasons) will assume it's Latin1.

Basically no really _valid_ latin1 will ever look like utf-8, so while
this changes our historical behaviour, it doesn't do so in practice, and
makes the default behaviour saner for the case where the input was already
in proper format.

We could do a more fancy guess, of course, but this correctly handled a
series of patches I just got from Andrew that had a mixture of Latin1 and
UTF-8 (in different emails, but without any character set indication).
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      b59d398b
    • し
      Document "git stash message..." · ec96e0f6
      由 しらいしななこ 提交于 
      The command was recently updated to take message on the command line, but
this feature has not been documented.
Signed-off-by: NNanako Shiraishi <nanako3@bluebottle.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      ec96e0f6
    • S
      unpack-trees.c: assume submodules are clean during check-out · 0cf73755
      由 Sven Verdoolaege 提交于 
      In particular, when moving back to a commit without a given submodule
and then moving back forward to a commit with the given submodule,
we shouldn't complain that updating would lose untracked file in
the submodule, because git currently does not checkout subprojects
during superproject check-out.
Signed-off-by: NSven Verdoolaege <skimo@kotnet.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      0cf73755
    • J
      Merge branch 'maint' · c1c10a3f
      由 Junio C Hamano 提交于 
      * maint:
  Force listingblocks to be monospaced in manpages
  Do not expect unlink(2) to fail on a directory.
      c1c10a3f
    • J
      Force listingblocks to be monospaced in manpages · 281a53bb
      由 Julian Phillips 提交于 
      For the html output we can use a stylesheet to make sure that the
listingblocks are presented in a monospaced font.  For the manpages do
it manually by inserting a ".ft C" before and ".ft" after the block in
question.

In order for these roff commands to get through to the manpage they
have to be element encoded to prevent quoting.
Signed-off-by: NJulian Phillips <julian@quantumfyre.co.uk>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      281a53bb
  3. 18 7月, 2007 1 次提交
    • J
      Do not expect unlink(2) to fail on a directory. · fa2e71c9
      由 Junio C Hamano 提交于 
      When "git checkout-index" checks out path A/B/C, it makes sure A
and A/B are truly directories; if there is a regular file or
symlink at A, we prefer to remove it.

We used to do this by catching an error return from mkdir(2),
and on EEXIST did unlink(2), and when it succeeded, tried
another mkdir(2).

Thomas Glanzmann found out the above does not work on Solaris
for a root user, as unlink(2) was so old fashioned there that it
allowed to unlink a directory.

As pointed out, this still doesn't guarantee that git won't call
"unlink()" on a directory (race conditions etc), but that's
fundamentally true (there is no "funlink()" like there is
"fstat()"), and besides, that is in no way git-specific (ie it's
true of any application that gets run as root).
Acked-by: NLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      fa2e71c9
  5. 17 7月, 2007 2 次提交
  7. 16 7月, 2007 6 次提交
  9. 15 7月, 2007 10 次提交
  11. 14 7月, 2007 8 次提交
  13. 13 7月, 2007 8 次提交