1. 02 Dec, 2008 8 commits
  2. 01 Dec, 2008 18 commits
  3. 28 Nov, 2008 14 commits
    • Junio C Hamano's avatar
      Merge branch 'cc/bisect-skip' · d5cbdba8
      Junio C Hamano authored
      * cc/bisect-skip:
        bisect: teach "skip" to accept special arguments like "A..B"
      d5cbdba8
    • Junio C Hamano's avatar
      Merge branch 'js/mingw-rename-fix' · 8c1944dd
      Junio C Hamano authored
      * js/mingw-rename-fix:
        compat/mingw.c: Teach mingw_rename() to replace read-only files
      8c1944dd
    • Junio C Hamano's avatar
      Merge branch 'st/levenshtein' · ef4daa74
      Junio C Hamano authored
      * st/levenshtein:
        Document levenshtein.c
        Fix deletion of last character in levenshtein distance
      ef4daa74
    • Junio C Hamano's avatar
      Merge branch 'cr/remote-update-v' · cab7d7d8
      Junio C Hamano authored
      * cr/remote-update-v:
        git-remote: add verbose mode to git remote update
      cab7d7d8
    • Junio C Hamano's avatar
      Merge branch 'rs/strbuf-expand' · 2d2b3fd8
      Junio C Hamano authored
      * rs/strbuf-expand:
        remove the unused files interpolate.c and interpolate.h
        daemon: deglobalize variable 'directory'
        daemon: inline fill_in_extra_table_entries()
        daemon: use strbuf_expand() instead of interpolate()
        merge-recursive: use strbuf_expand() instead of interpolate()
        add strbuf_expand_dict_cb(), a helper for simple cases
      2d2b3fd8
    • Junio C Hamano's avatar
      Merge branch 'mv/clone-strbuf' · 14de7393
      Junio C Hamano authored
      * mv/clone-strbuf:
        builtin_clone: use strbuf in cmd_clone()
        builtin-clone: use strbuf in clone_local() and copy_or_link_directory()
        builtin-clone: use strbuf in guess_dir_name()
      14de7393
    • Junio C Hamano's avatar
      Merge branch 'lt/preload-lstat' · 2af96647
      Junio C Hamano authored
      * lt/preload-lstat:
        Fix index preloading for racy dirty case
        Add cache preload facility
      2af96647
    • Junio C Hamano's avatar
      Merge branch 'ta/quiet-pull' · 98cdf78c
      Junio C Hamano authored
      * ta/quiet-pull:
        Retain multiple -q/-v occurrences in git pull
        Teach/Fix pull/fetch -q/-v options
      98cdf78c
    • Junio C Hamano's avatar
      Merge branch 'ph/send-email' · 496db642
      Junio C Hamano authored
      * ph/send-email:
        git send-email: ask less questions when --compose is used.
        git send-email: add --annotate option
        git send-email: interpret unknown files as revision lists
        git send-email: make the message file name more specific.
      496db642
    • Junio C Hamano's avatar
      Merge branch 'maint' · 455d0f5c
      Junio C Hamano authored
      * maint:
        sha1_file.c: resolve confusion EACCES vs EPERM
        sha1_file: avoid bogus "file exists" error message
        git checkout: don't warn about unborn branch if -f is already passed
        bash: offer refs instead of filenames for 'git revert'
        bash: remove dashed command leftovers
        git-p4: fix keyword-expansion regex
        fast-export: use an unsorted string list for extra_refs
        Add new testcase to show fast-export does not always exports all tags
      455d0f5c
    • Junio C Hamano's avatar
      Merge branch 'mv/fast-export' into maint · 539eec48
      Junio C Hamano authored
      * mv/fast-export:
        fast-export: use an unsorted string list for extra_refs
        Add new testcase to show fast-export does not always exports all tags
      539eec48
    • Sam Vilain's avatar
      sha1_file.c: resolve confusion EACCES vs EPERM · 35243577
      Sam Vilain authored
      An earlier commit 916d081b (Nicer error messages in case saving an object
      to db goes wrong, 2006-11-09) confused EACCES with EPERM, the latter of
      which is an unlikely error from mkstemp().
      Signed-off-by: Sam Vilain's avatarSam Vilain <[email protected]>
      35243577
    • Joey Hess's avatar
      sha1_file: avoid bogus "file exists" error message · 65117abc
      Joey Hess authored
      This avoids the following misleading error message:
      
      error: unable to create temporary sha1 filename ./objects/15: File exists
      
      mkstemp can fail for many reasons, one of which, ENOENT, can occur if
      the directory for the temp file doesn't exist. create_tmpfile tried to
      handle this case by always trying to mkdir the directory, even if it
      already existed. This caused errno to be clobbered, so one cannot tell
      why mkstemp really failed, and it truncated the buffer to just the
      directory name, resulting in the strange error message shown above.
      
      Note that in both occasions that I've seen this failure, it has not been
      due to a missing directory, or bad permissions, but some other, unknown
      mkstemp failure mode that did not occur when I ran git again. This code
      could perhaps be made more robust by retrying mkstemp, in case it was a
      transient failure.
      Signed-off-by: default avatarJoey Hess <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      65117abc
    • Matt McCutchen's avatar
      git checkout: don't warn about unborn branch if -f is already passed · 1510dbe3
      Matt McCutchen authored
      I think it's unnecessary to warn that the checkout has been forced due to an
      unborn current branch if -f has been explicitly passed.  For one project, I am
      using git-new-workdir to create workdirs from a bare repository whose HEAD is
      set to an unborn branch, and this warning started to irritate me.
      Signed-off-by: Matt McCutchen's avatarMatt McCutchen <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      1510dbe3