Skip to content

G
git

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

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

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

切换分支/标签
  1. 15 5月, 2006 2 次提交
  3. 14 5月, 2006 4 次提交
    • L
      git config syntax updates · d14f7764
      由 Linus Torvalds 提交于 
      This updates the hierarchical section name syntax to

	[section<space>+"<randomstring>"]

where the only rule for "randomstring" is that it can't contain a newline,
and if you really want to insert a double-quote, you do it with \".

It turns that into the section name "secion.randomstring".  The
"section" part is still case insensitive, but the "randomstring"
part is case sensitive.

So you could use this for things like

	[email "torvalds@osdl.org"]
		name = Linus Torvalds

if you wanted to do the "email->name" conversion as part of the config
file format (I'm not claiming that is sensible, I'm just giving it as an
insane example). That would show up as the association

	email.torvalds@osdl.org.name -> Linus Torvalds

which is easy to parse (the "." in the email _looks_ ambiguous, but it
isn't: you know that there will always be a single key-name, so you find
the key name with "strrchr(name, '.')" and things are entirely
unambiguous).

Repo-config is updated to be able to parse the new format, and also
write things out in the new format.

[jc: rolled two patches from Linus and one fix-up from Sean into one,
 with additional adjustments for t/t1300 test to check the case
 insensitiveness of section base and variable and case sensitiveness
 of the extended section part.  Then stripped some part off to make
 the result applicable to the stale 1.3.X series that does not have
 recent enhancements. ]
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
Signed-off-by: NSean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
      d14f7764
    • S
      Another config file parsing fix. · bdf0ef08
      由 sean 提交于 
      If the variable we need to store should go into a section
that currently only has a single variable (not matching
the one we're trying to insert), we will already be into
the next section before we notice we've bypassed the correct
location to insert the variable.

To handle this case we store the current location as soon
as we find a variable matching the section of our new
variable.

This breakage was brought up by Linus.
Signed-off-by: NSean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
      bdf0ef08
    • J
      checkout: use --aggressive when running a 3-way merge (-m). · 618faa1d
      由 Junio C Hamano 提交于 
      After doing an in-index 3-way merge, we always do the stock
"merge-index merge-one-file" without doing anything fancy;
use of --aggressive helps performance quite a bit.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
      618faa1d
    • D
      Fix git-pack-objects for 64-bit platforms · 66561f5a
      由 Dennis Stosberg 提交于 
      The offset of an object in the pack is recorded as a 4-byte integer
in the index file.  When reading the offset from the mmap'ed index
in prepare_pack_revindex(), the address is dereferenced as a long*.
This works fine as long as the long type is four bytes wide.  On
NetBSD/sparc64, however, a long is 8 bytes wide and so dereferencing
the offset produces garbage.

[jc: taking suggestion by Linus to use uint32_t]
Signed-off-by: NDennis Stosberg <dennis@stosberg.net>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
      66561f5a
  5. 10 5月, 2006 1 次提交
  7. 09 5月, 2006 5 次提交
  9. 08 5月, 2006 6 次提交
  11. 06 5月, 2006 3 次提交
  13. 04 5月, 2006 4 次提交
  15. 03 5月, 2006 2 次提交
  17. 30 4月, 2006 1 次提交
  19. 29 4月, 2006 6 次提交
  21. 28 4月, 2006 2 次提交
  23. 27 4月, 2006 3 次提交
  25. 25 4月, 2006 1 次提交