1. 12 10月, 2005 10 次提交
    • J
      Merge branch 'fixes' · d06b689a
      Junio C Hamano 提交于
      d06b689a
    • M
      [PATCH] cvsimport: don't pass --cvs-direct if user options contradict us · df73e9c6
      Martin Langhoff 提交于
      Detecting if the user passed --no-cvs-direct and don't force the mode.
      It allows us to support all the protocol that the standard cvs client
      supports at the snail speed you should expect.
      
      This only affects the rlog reading stage.
      Signed-off-by: NMartin Langhoff <martin@catalyst.net.nz>
      df73e9c6
    • L
      Make git config variable names case-insensitive · 128af9d1
      Linus Torvalds 提交于
      They always were meant to be case-insensitive, but I had missed one
      "tolower()", making that not true.
      
      The actual _values_ aren't case-insensitive, of course, although some uses
      of them may be (ie boolean parsing uses "strcasecmp()" to match against
      the strings "true" and "false").
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      128af9d1
    • L
      Use git config file for committer name and email info · e1b10391
      Linus Torvalds 提交于
      This starts using the "user.name" and "user.email" config variables if
      they exist as the default name and email when committing.  This means
      that you don't have to use the GIT_COMMITTER_EMAIL environment variable
      to override your email - you can just edit the config file instead.
      
      The patch looks bigger than it is because it makes the default name and
      email information non-static and renames it appropriately.  And it moves
      the common git environment variables into a new library file, so that
      you can link against libgit.a and get the git environment without having
      to link in zlib and libcrypt.
      
      In short, most of it is renaming and moving, the real change core is
      just a few new lines in "git_default_config()" that copies the user
      config values to the new base.
      
      It also changes "git-var -l" to list the config variables.
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      e1b10391
    • T
      Export template_dir in Makefile. · ec2d1511
      Tom Prince 提交于
      If somebody set template_dir in config.mak. Then git-init-db would be
      compiled with the correct location but the templates would be installed
      in the default location. Fix it.
      Signed-off-by: NTom Prince <tom.prince@ualberta.net>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      ec2d1511
    • J
      Use core.filemode. · 3e09cdfd
      Junio C Hamano 提交于
      With "[core] filemode = false", you can tell git to ignore
      differences in the working tree file only in executable bit.
      
       * "git-update-index --refresh" does not say "needs update" if index
         entry and working tree file differs only in executable bit.
      
       * "git-update-index" on an existing path takes executable bit
         from the existing index entry, if the path and index entry are
         both regular files.
      
       * "git-diff-files" and "git-diff-index" without --cached flag
         pretend the path on the filesystem has the same executable
         bit as the existing index entry, if the path and index entry
         are both regular files.
      
      If you are on a filesystem with unreliable mode bits, you may need to
      force the executable bit after registering the path in the index.
      
       * "git-update-index --chmod=+x foo" flips the executable bit of the
         index file entry for path "foo" on.  Use "--chmod=-x" to flip it
         off.
      
      Note that --chmod only works in index file and does not look at nor
      update the working tree.
      
      So if you are on a filesystem and do not have working executable bit,
      you would do:
      
       1. set the appropriate .git/config option;
      
       2. "git-update-index --add new-file.c"
      
       3. "git-ls-files --stage new-file.c" to see if it has the desired
         mode bits.  If not, e.g. to drop executable bit picked up from the
         filesystem, say "git-update-index --chmod=-x new-file.c".
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      3e09cdfd
    • L
      Improve config file escape sanity checking · 5cbb401d
      Linus Torvalds 提交于
      I had meant to disallow unknown escape characters in the config file
      parser, but instead an unknown escaped character would silently pass
      through as itself. That's correct for some cases (notably '\' itself), but
      wasn't correct in general.
      
      This fixes it, and makes the parser write a nice error message if the
      config file contains bogus escaped characters.
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      5cbb401d
    • J
      show-branch: optionally use unique prefix as name. · 013f276e
      Junio C Hamano 提交于
      git-show-branch acquires two new options. --sha1-name to name
      commits using the unique prefix of their object names, and
      --no-name to not to show names at all.
      
      This was outlined in <7vk6gpyuyr.fsf@assigned-by-dhcp.cox.net>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      013f276e
    • J
      Support custom build options in config.mak · f2d6a256
      Johannes Schindelin 提交于
      With this patch, it is possible to store configuration options like
      NO_CURL=YesPlease or NO_OPENSSL=YesPlease into a file named
      config.mak, which will be included in the Makefile.
      
      [jc: redone with suggestion from Daniel Barkalow to just use -include]
      Signed-off-by: NJohannes Schindelin <Johannes.Schindelin@gmx.de>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      f2d6a256
    • J
      Use git-update-ref and git-symbolic-ref in tests · 0a81552e
      Johannes Schindelin 提交于
      This makes all tests pass on cygwin.
      Signed-off-by: NJohannes Schindelin <Johannes.Schindelin@gmx.de>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      0a81552e
  2. 11 10月, 2005 21 次提交
  3. 10 10月, 2005 7 次提交
  4. 09 10月, 2005 2 次提交