Permalink
Commits on Dec 1, 2008
  1. GIT 1.6.1-rc1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 1, 2008
  2. Include git-gui--askpass in git-gui RPM package

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 1, 2008
  3. Merge git://git.kernel.org/pub/scm/gitk/gitk

    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Avoid handling the Return key twice in Add Branch
      gitk: Show local changes properly when we have a path limit
      gitk: Fix switch statement in parseviewargs
      gitk: Index line[hnd]tag arrays by id rather than row number
    gitster committed Dec 1, 2008
  4. Merge git://repo.or.cz/git-gui

    * git://repo.or.cz/git-gui:
      git-gui: update Japanese translation
      git-gui: french translation update
      Updated Swedish translation (514t0f0u).
      git gui: update Italian translation
      Update Hungarian translation. 100% completed.
    gitster committed Dec 1, 2008
  5. send-email: do not reverse the command line arguments

    The loop picks elements from @ARGV one by one, sifts them into arguments
    meant for format-patch and the script itself, and pushes them to @files
    and @rev_list_opts arrays.  Pick elements from @ARGV starting at the
    beginning using shift, instead of at the end using pop, as push appends
    them to the end of the array.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 1, 2008
  6. Merge branch 'maint'

    * maint:
      Update draft release notes to 1.6.0.5
      generate-cmdlist.sh: avoid selecting synopsis at wrong place
    gitster committed Dec 1, 2008
  7. Update draft release notes to 1.6.0.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 1, 2008
  8. Merge branch 'st/maint-tag' into maint

    * st/maint-tag:
      tag: Add more tests about mixing incompatible modes and options
      tag: Check that options are only allowed in the appropriate mode
    gitster committed Dec 1, 2008
  9. Merge branch 'mk/maint-cg-push' into maint

    * mk/maint-cg-push:
      git push: Interpret $GIT_DIR/branches in a Cogito compatible way
    gitster committed Dec 1, 2008
  10. generate-cmdlist.sh: avoid selecting synopsis at wrong place

    In "common" man pages there is luckily no "NAME" anywhere except at
    beginning of documents. If there is another "NAME", sed could
    mis-select it and lead to common-cmds.h corruption. So better nail it
    at beginning of line, which would reduce corruption chance.
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    pclouds committed with gitster Nov 30, 2008
Commits on Nov 28, 2008
  1. Merge branch 'cc/bisect-skip'

    * cc/bisect-skip:
      bisect: teach "skip" to accept special arguments like "A..B"
    gitster committed Nov 28, 2008
  2. Merge branch 'js/mingw-rename-fix'

    * js/mingw-rename-fix:
      compat/mingw.c: Teach mingw_rename() to replace read-only files
    gitster committed Nov 28, 2008
  3. Merge branch 'st/levenshtein'

    * st/levenshtein:
      Document levenshtein.c
      Fix deletion of last character in levenshtein distance
    gitster committed Nov 28, 2008
  4. Merge branch 'cr/remote-update-v'

    * cr/remote-update-v:
      git-remote: add verbose mode to git remote update
    gitster committed Nov 28, 2008
  5. Merge branch 'rs/strbuf-expand'

    * 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
    gitster committed Nov 28, 2008
  6. Merge branch 'mv/clone-strbuf'

    * 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()
    gitster committed Nov 28, 2008
  7. Merge branch 'lt/preload-lstat'

    * lt/preload-lstat:
      Fix index preloading for racy dirty case
      Add cache preload facility
    gitster committed Nov 28, 2008
  8. Merge branch 'ta/quiet-pull'

    * ta/quiet-pull:
      Retain multiple -q/-v occurrences in git pull
      Teach/Fix pull/fetch -q/-v options
    gitster committed Nov 28, 2008
  9. Merge branch 'ph/send-email'

    * 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.
    gitster committed Nov 28, 2008
  10. Merge branch 'maint'

    * 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
    gitster committed Nov 28, 2008
  11. Merge branch 'mv/fast-export' into maint

    * 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
    gitster committed Nov 28, 2008
  12. sha1_file.c: resolve confusion EACCES vs EPERM

    An earlier commit 916d081 (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 <sam@vilain.net>
    samv committed with gitster Nov 14, 2008
  13. sha1_file: avoid bogus "file exists" error message

    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: Joey Hess <joey@kitenet.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    joeyh committed with gitster Nov 20, 2008
  14. git checkout: don't warn about unborn branch if -f is already passed

    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 <matt@mattmccutchen.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mattmccutchen committed with gitster Nov 24, 2008
  15. bash: offer refs instead of filenames for 'git revert'

    The completion script for 'git revert' currently offers options and
    filenames.  However, 'git revert' doesn't take any filenames from the
    command line, but a single commit.  Therefore, it's more sane to offer
    refs instead.
    
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    szeder committed with gitster Nov 27, 2008
  16. bash: complete full refs

    Sometimes it's handy to complete full refs, e.g. the user has some
    refs outside of refs/{heads,remotes,tags} or the user wants to
    complete some git command's special refs (like 'git show
    refs/bisect/bad').
    
    To do that, we check whether the ref to be completed starts with
    'refs/' or is 'refs' (to reduce the risk of matching 'refs-').  If it
    does, then we offer full refs for completion; otherwise everything
    works as usual.
    
    This way the impact on the common case is fairly small (hopefully not
    many users have branches or tags starting with 'refs'), and in the
    special case the cost of typing out 'refs' is bearable.
    
    While at it, also remove the unused 'cmd' variable from '__git_refs'.
    
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    szeder committed with gitster Nov 28, 2008
  17. bash: remove dashed command leftovers

    Commit 5a625b0 (bash: remove fetch, push, pull dashed form leftovers,
    2008-10-03) did that already, but there were still some git-cmd left
    here and there.
    
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    szeder committed with gitster Nov 27, 2008
Commits on Nov 27, 2008
  1. Merge branch 'pw/maint-p4' into maint

    * pw/maint-p4:
      git-p4: fix keyword-expansion regex
    gitster committed Nov 27, 2008
  2. git-p4: fix keyword-expansion regex

    This text:
    
         my $dir = $File::Find::dir;
         return if ($dir !~ m,$options->{dirpat}$,);
    
    was improperly converted to:
    
         my $dir = $File$dir !~ m,$options->{dirpat}$,);
    
    by the keyword identifier expansion code.  Add a \n
    to make sure the regex doesn't go across end-of-line
    boundaries.
    
    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Acked-by: Simon Hausmann <simon@lst.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Pete Wyckoff committed with gitster Nov 26, 2008
  3. Fix typos in the documentation.

    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Ralf Wildenhues committed with gitster Nov 27, 2008
  4. Merge branch 'rw/maint-typofix' into rw/typofix

    * rw/maint-typofix:
      Fix typos in the documentation.
    gitster committed Nov 27, 2008
  5. Fix typos in the documentation.

    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Ralf Wildenhues committed with gitster Nov 27, 2008
Commits on Nov 26, 2008
  1. git-gui: update Japanese translation

    Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Nanako Shiraishi committed with spearce Nov 26, 2008
  2. Merge branch 'maint'

    * maint:
      Teach "git diff" to honour --[no-]ext-diff
    gitster committed Nov 26, 2008
  3. Merge branch 'mm/sort-config-doc'

    * mm/sort-config-doc:
      config.txt: alphabetize configuration sections
    gitster committed Nov 26, 2008