1. 15 May, 2006 4 commits
  2. 14 May, 2006 3 commits
  3. 13 May, 2006 4 commits
    • Linus Torvalds's avatar
      git config syntax updates · d14f7764
      Linus Torvalds authored
      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: default avatarLinus Torvalds <torvalds@osdl.org>
      Signed-off-by: default avatarSean Estabrooks <seanlkml@sympatico.ca>
      Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>
      d14f7764
    • sean's avatar
      Another config file parsing fix. · bdf0ef08
      sean authored
      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: default avatarSean Estabrooks <seanlkml@sympatico.ca>
      Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>
      bdf0ef08
    • Junio C Hamano's avatar
      checkout: use --aggressive when running a 3-way merge (-m). · 618faa1d
      Junio C Hamano authored
      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: default avatarJunio C Hamano <junkio@cox.net>
      618faa1d
    • Dennis Stosberg's avatar
      Fix git-pack-objects for 64-bit platforms · 66561f5a
      Dennis Stosberg authored
      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: default avatarDennis Stosberg <dennis@stosberg.net>
      Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>
      66561f5a
  4. 10 May, 2006 1 commit
  5. 09 May, 2006 2 commits
  6. 08 May, 2006 4 commits
  7. 07 May, 2006 5 commits
  8. 05 May, 2006 3 commits
  9. 04 May, 2006 3 commits
  10. 03 May, 2006 1 commit
  11. 02 May, 2006 2 commits
  12. 30 Apr, 2006 1 commit
  13. 28 Apr, 2006 7 commits