1. 10 Feb, 2009 9 commits
  2. 09 Feb, 2009 8 commits
  3. 08 Feb, 2009 2 commits
    • Stephan Beyer's avatar
      add -p: get rid of Git.pm warnings about unitialized values · 9aad6cba
      Stephan Beyer authored
      After invoking git add -p I always got the warnings:
      
       Use of uninitialized value $_[3] in exec at Git.pm line 1282.
       Use of uninitialized value $args[2] in join or string at Git.pm line 1264.
      
      A bisect showed that these warnings occur in a3019736 "add -p: print errors
      in separate color" the first time.
      
      They can be reproduced by setting color.ui (or color.interactive) to "auto"
      and unsetting color.interactive.help and color.interactive.error.
      I am using Perl 5.10.0.
      
      The reason of the warning is that color.interactive.error defaults to
      color.interactive.help which defaults to nothing in the specific codepath.
      It defaults to 'red bold' some lines above which could lead to the wrong
      assumption that it always defaults to 'red bold' now.
      
      This patch lets it default to 'red bold', blowing the warnings away.
      Signed-off-by: default avatarStephan Beyer <[email protected]>
      Acked-By: default avatarThomas Rast <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      9aad6cba
    • Christian Couder's avatar
      rev-list: fix showing distance when using --bisect-all · 6e46cc0d
      Christian Couder authored
      Before d467a525 ("Make '--decorate' set an explicit 'show_decorations'
      flag", Nov 3 2008), commit decorations were shown whenever they exist, and
      distances stored in them by "git rev-list --bisect-all" were automatically
      shown.  d467a525 changed the rule so that commit decorations are not shown
      unless rev_info explicitly asks to, with its show_decorations bit, but
      forgot that the ones "git rev-list --bisect-all" adds need to be shown.
      
      This patch fixes this old breakage.
      Signed-off-by: Christian Couder's avatarChristian Couder <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      6e46cc0d
  4. 07 Feb, 2009 14 commits
  5. 06 Feb, 2009 7 commits
    • Junio C Hamano's avatar
      Merge branch 'js/maint-remote-remove-mirror' · ba743d1b
      Junio C Hamano authored
      * 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
      ba743d1b
    • Junio C Hamano's avatar
      Merge branch 'js/notes' · 7b75b331
      Junio C Hamano authored
      * 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
      7b75b331
    • Junio C Hamano's avatar
      Merge branch 'jc/refuse-push-to-current' · 5d680a67
      Junio C Hamano authored
      * jc/refuse-push-to-current:
        receive-pack: explain what to do when push updates the current branch
      5d680a67
    • Junio C Hamano's avatar
      Merge branch 'rc/http-push' · 7aa4e736
      Junio C Hamano authored
      * 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
      7aa4e736
    • Junio C Hamano's avatar
      Merge branch 'gt/utf8-width' · 9242431c
      Junio C Hamano authored
      * gt/utf8-width:
        builtin-blame.c: Use utf8_strwidth for author's names
        utf8: add utf8_strwidth()
      9242431c
    • Junio C Hamano's avatar
      Merge branch 'jk/head-symref' · 74b11bc3
      Junio C Hamano authored
      * jk/head-symref:
        symbolic ref: refuse non-ref targets in HEAD
        validate_headref: tighten ref-matching to just branches
      74b11bc3
    • Junio C Hamano's avatar
      Merge branch 'cb/mergetool' · b371922a
      Junio C Hamano authored
      * 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
      b371922a