Permalink
Commits on Feb 7, 2009
  1. GIT 1.6.2-rc0

    gitster committed Feb 7, 2009
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'tr/add-p-single'

    gitster committed Feb 7, 2009
    * tr/add-p-single:
      add -p: import Term::ReadKey with 'require'
      add -p: print errors in separate color
      add -p: prompt for single characters
  3. Merge branch 'js/filter-branch-submodule'

    gitster committed Feb 7, 2009
    * js/filter-branch-submodule:
      filter-branch: do not consider diverging submodules a 'dirty worktree'
      filter-branch: Fix fatal error on bare repositories
  4. Merge branch 'maint'

    gitster committed Feb 7, 2009
    * maint:
      GIT 1.6.1.3
    
    Conflicts:
    	GIT-VERSION-GEN
    	RelNotes
  5. emacs: Remove the no longer maintained vc-git package.

    julliard committed Feb 7, 2009
    vc-git is distributed with Emacs since version 22.2, and is maintained
    in the Emacs CVS tree. This file is obsolete and causes trouble for
    people who want to add contrib/emacs to their load-path.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
  6. git.el: Add some notes about Emacs versions compatibility.

    julliard committed Feb 7, 2009
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
  7. git.el: Use integer instead of character constants in case statement.

    julliard committed Feb 7, 2009
    This is for compatibility with XEmacs. Reported by Vassili Karpov.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
  8. git.el: Set a regexp for paragraph-separate in log-edit mode.

    julliard committed Jan 27, 2009
    This allows using fill-paragraph on the log message without
    interference from the various header fields.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
  9. git.el: Make git-run-command-region display the error if any.

    julliard committed Nov 23, 2008
    This makes it easier to figure out why a commit has failed.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
  10. git.el: Add commands for cherry-pick and revert.

    julliard committed Nov 23, 2008
    Support for cherry-picking and reverting commits, with automatic
    formatting of the commit log message. Bound to C-c C-p and C-c C-v
    respectively.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
  11. git.el: Add a command to create a new branch.

    julliard committed Nov 23, 2008
    Prompts for a branch name, create a new branch at HEAD and switch to
    it. Bound to C-c C-b by default.
    
    Based on a patch by Rémi Vanicat <vanicat@debian.org>.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
  12. git.el: Add a checkout command.

    julliard committed Nov 23, 2008
    Prompts for a branch name and checks it out. Bound to C-c C-o by
    default.
    
    Based on a patch by Rémi Vanicat <vanicat@debian.org>.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
  13. GIT 1.6.1.3

    gitster committed Feb 7, 2009
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  14. add -p: import Term::ReadKey with 'require'

    trast committed with gitster Feb 6, 2009
    eval{use...} is no good because the 'use' is evaluated at compile
    time, so manually 'require' it.  We need to forward declare the
    functions we use, otherwise Perl raises a compilation error.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 6, 2009
  1. Merge branch 'js/maint-remote-remove-mirror'

    gitster committed Feb 6, 2009
    * js/maint-remote-remove-mirror:
      builtin-remote: make rm operation safer in mirrored repository
      builtin-remote: make rm() use properly named variable to hold return value
  2. Merge branch 'js/notes'

    gitster committed Feb 6, 2009
    * js/notes:
      git-notes: fix printing of multi-line notes
      notes: fix core.notesRef documentation
      Add an expensive test for git-notes
      Speed up git notes lookup
      Add a script to edit/inspect notes
      Introduce commit notes
    
    Conflicts:
    	pretty.c
  3. Merge branch 'jc/refuse-push-to-current'

    gitster committed Feb 6, 2009
    * jc/refuse-push-to-current:
      receive-pack: explain what to do when push updates the current branch
  4. Merge branch 'rc/http-push'

    gitster committed Feb 6, 2009
    * rc/http-push:
      http-push: wrap signature of get_remote_object_url
      http-push: add back underscore separator before lock token
      http-push.c: get_remote_object_url() is only used under USE_CURL_MULTI
      http-push: refactor request url creation
  5. Merge branch 'gt/utf8-width'

    gitster committed Feb 6, 2009
    * gt/utf8-width:
      builtin-blame.c: Use utf8_strwidth for author's names
      utf8: add utf8_strwidth()
  6. Merge branch 'jk/head-symref'

    gitster committed Feb 6, 2009
    * jk/head-symref:
      symbolic ref: refuse non-ref targets in HEAD
      validate_headref: tighten ref-matching to just branches
  7. Merge branch 'cb/mergetool'

    gitster committed Feb 6, 2009
    * cb/mergetool:
      mergetool: fix running mergetool in sub-directories
      mergetool: Add a test for running mergetool in a sub-directory
      mergetool: respect autocrlf by using checkout-index
  8. Merge branch 'maint'

    gitster committed Feb 6, 2009
    * maint:
      Fixed broken git help -w when installing from RPM
  9. Merge branch 'maint-1.6.0' into maint

    gitster committed Feb 6, 2009
    * maint-1.6.0:
      Fixed broken git help -w when installing from RPM
  10. Merge branch 'jc/maint-apply-fix' into maint

    gitster committed Feb 6, 2009
    * jc/maint-apply-fix:
      builtin-apply.c: do not set bogus mode in check_preimage() for deleted path
  11. Merge branch 'am/maint-push-doc' into maint

    gitster committed Feb 6, 2009
    * am/maint-push-doc:
      Documentation: rework src/dst description in git push
      Documentation: more git push examples
      Documentation: simplify refspec format description
  12. Merge branch 'sg/maint-gitdir-in-subdir' into maint

    gitster committed Feb 6, 2009
    * sg/maint-gitdir-in-subdir:
      Fix gitdir detection when in subdir of gitdir
  13. Merge branch 'lt/maint-wrap-zlib' into maint

    gitster committed Feb 6, 2009
    * lt/maint-wrap-zlib:
      Wrap inflate and other zlib routines for better error reporting
    
    Conflicts:
    	http-push.c
    	http-walker.c
    	sha1_file.c
  14. Merge branch 'jc/maint-split-diff-metainfo' into maint

    gitster committed Feb 6, 2009
    * jc/maint-split-diff-metainfo:
      diff.c: output correct index lines for a split diff
  15. Merge branch 'js/maint-all-implies-HEAD' into maint

    gitster committed Feb 6, 2009
    * js/maint-all-implies-HEAD:
      bundle: allow the same ref to be given more than once
      revision walker: include a detached HEAD in --all
  16. Merge branch 'kc/maint-diff-bwi-fix' into maint

    gitster committed Feb 6, 2009
    * kc/maint-diff-bwi-fix:
      Fix combined use of whitespace ignore options to diff
      test more combinations of ignore-whitespace options to diff
  17. filter-branch: do not consider diverging submodules a 'dirty worktree'

    dscho committed with gitster Feb 5, 2009
    At the end of filter-branch in a non-bare repository, the work tree is
    updated with "read-tree -m -u HEAD", to carry the change forward in case
    the current branch was rewritten.  In order to avoid losing any local
    change during this step, filter-branch refuses to work when there are
    local changes in the work tree.
    
    This "read-tree -m -u HEAD" operation does not affect what commit is
    checked out in a submodule (iow, it does not touch .git/HEAD in a
    submodule checkout), and checking if there is any local change to the
    submodule is not useful.
    
    Staged submodules _are_ considered to be 'dirty', however,  as the
    "read-tree -m -u HEAD" could result in loss of staged information
    otherwise.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  18. add -p: print errors in separate color

    trast committed with gitster Feb 5, 2009
    Print interaction error messages in color.interactive.error, which
    defaults to the value of color.interactive.help.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  19. add -p: prompt for single characters

    trast committed with gitster Feb 5, 2009
    Use Term::ReadKey, if available and enabled with interactive.singlekey,
    to let the user answer add -p's prompts by pressing a single key.  We're
    not doing the same in the main 'add -i' interface because file selection
    etc. may expect several characters.
    
    Two commands take an argument: 'g' can easily cope since it'll just
    offer a choice of chunks.  '/' now (unconditionally, even without
    readkey) offers a chance to enter a regex if none was given.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 5, 2009
  1. Makefile: minor improvements for Mac OS X (Darwin)

    jaysoffian committed with gitster Feb 5, 2009
    1) Instead of requesting OLD_ICONV on all Mac OS X versions except for 10.5
    (which will break when 10.6 is released), exlicitly request it for versions
    older than 10.5.
    
    2) NO_STRLCPY is not needed since Mac OS X 10.2. Noticed by Benjamin Kramer.
    
    Note that uname -r returns the underlying Darwin version, which can be mapped
    to Mac OS X version at http://www.opensource.apple.com/darwinsource/
    
    Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. config.mak.in: define paths without trailing slash

    TurboGit committed with gitster Feb 5, 2009
    The main Makefile defines gitexecdir and template_dir without trailing
    slash.  config.mak.in should do the same to be consistent.
    
    Signed-off-by: Pascal Obry <pascal@obry.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>