Skip to content
Commits on Feb 23, 2012
  1. @gitster

    Git 1.7.9.2

    gitster committed Feb 22, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 22, 2012
  1. @foolip @gitster

    completion: use tabs for indentation

    foolip committed with gitster Feb 22, 2012
    CodingGuidlines confidently declares "We use tabs for indentation."
    It would be a shame if it were caught lying.
    
    Signed-off-by: Philip Jägenstedt <philip@foolip.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @foolip @gitster

    completion: remove stale "to submit patches" documentation

    foolip committed with gitster Feb 22, 2012
    It was out-of-sync with the reality of who works on this
    script. Defer (silently) to Documentation/SubmittingPatches
    like all other code.
    
    Signed-off-by: Philip Jägenstedt <philip@foolip.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 21, 2012
  1. @gitster

    Update draft release notes to 1.7.9.2

    gitster committed Feb 21, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'cb/receive-pack-keep-errors' into maint

    gitster committed Feb 21, 2012
    * cb/receive-pack-keep-errors:
      do not override receive-pack errors
  3. @gitster

    Merge branch 'cb/transfer-no-progress' into maint

    gitster committed Feb 21, 2012
    * cb/transfer-no-progress:
      push/fetch/clone --no-progress suppresses progress output
  4. @gitster

    Merge branch 'jk/git-dir-lookup' into maint

    gitster committed Feb 21, 2012
    * jk/git-dir-lookup:
      standardize and improve lookup rules for external local repos
  5. @gitster

    Merge branch 'jc/diff-stat-scaler' into maint

    gitster committed Feb 21, 2012
    * jc/diff-stat-scaler:
      diff --stat: show bars of same length for paths with same amount of changes
  6. @gitster

    Merge branch 'zj/term-columns' into maint

    gitster committed Feb 21, 2012
    * zj/term-columns:
      pager: find out the terminal width before spawning the pager
  7. @gitster

    Merge branch 'cb/maint-rev-list-verify-object' into maint

    gitster committed Feb 21, 2012
    * cb/maint-rev-list-verify-object:
      git rev-list: fix invalid typecast
  8. @gitster

    Merge branch 'cb/maint-t5541-make-server-port-portable' into maint

    gitster committed Feb 21, 2012
    * cb/maint-t5541-make-server-port-portable:
      t5541: check error message against the real port number used
  9. @gitster

    Merge branch 'dp/i18n-libcharset' into maint

    gitster committed Feb 21, 2012
    * dp/i18n-libcharset:
      Makefile: introduce CHARSET_LIB to link with -lcharset
  10. @gitster

    Merge branch 'jk/grep-binary-attribute' into maint

    gitster committed Feb 21, 2012
    * jk/grep-binary-attribute:
      grep: pre-load userdiff drivers when threaded
      grep: load file data after checking binary-ness
      grep: respect diff attributes for binary-ness
      grep: cache userdiff_driver in grep_source
      grep: drop grep_buffer's "name" parameter
      convert git-grep to use grep_source interface
      grep: refactor the concept of "grep source" into an object
      grep: move sha1-reading mutex into low-level code
      grep: make locking flag global
  11. @gitster

    Merge branch 'nd/diffstat-gramnum' into maint

    gitster committed Feb 21, 2012
    * nd/diffstat-gramnum:
      Use correct grammar in diffstat summary line
  12. @gitster

    Merge branch 'nd/find-pack-entry-recent-cache-invalidation' into maint

    gitster committed Feb 21, 2012
    * nd/find-pack-entry-recent-cache-invalidation:
      find_pack_entry(): do not keep packed_git pointer locally
      sha1_file.c: move the core logic of find_pack_entry() into fill_pack_entry()
  13. @gitster

    Merge branch 'tt/profile-build-fix' into maint

    gitster committed Feb 21, 2012
    * tt/profile-build-fix:
      Makefile: fix syntax for older make
      Fix build problems related to profile-directed optimization
  14. @gitster

    Merge branch 'fc/zsh-completion' into maint

    gitster committed Feb 21, 2012
    * fc/zsh-completion:
      completion: simplify __gitcomp and __gitcomp_nl implementations
      completion: use ls -1 instead of rolling a loop to do that ourselves
      completion: work around zsh option propagation bug
  15. @mantiz @gitster

    completion: Allow dash as the first character for __git_ps1

    mantiz committed with gitster Feb 20, 2012
    If the argument for `__git_ps1` begins with a dash, `printf` tries to
    interpret it as an option which results in an error message.
    The problem is solved by adding '--' before the argument to tell
    `printf` to not interpret the following argument as an option.
    Adding '--' directly to the argument does not help because the argument
    is enclosed by double quotes.
    
    Signed-off-by: Christian Hammerl <info@christian-hammerl.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 20, 2012
  1. @gitster

    Update draft release notes to 1.7.9.2

    gitster committed Feb 20, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @jnareb @gitster

    gitweb: Fix 'grep' search for multiple matches in file

    jnareb committed with gitster Feb 15, 2012
    Commit ff7f218 (gitweb: Fix file links in "grep" search, 2012-01-05),
    added $file_href variable, to reduce duplication and have the fix
    applied in single place.
    
    Unfortunately it made variable defined inside the loop, not taking into
    account the fact that $file_href was set only if file changed.
    Therefore for files with multiple matches $file_href was undefined for
    second and subsequent matches.
    
    Fix this bug by moving $file_href declaration outside loop.
    
    Adds tests for almost all forms of sarch in gitweb, which were missing
    from testuite.  Note that it only tests if there are no warnings, and
    it doesn't check that gitweb finds what it should find.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 16, 2012
  1. @gitster

    Update draft release notes to 1.7.9.2

    gitster committed Feb 16, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'jc/checkout-out-of-unborn' into maint

    gitster committed Feb 16, 2012
    * jc/checkout-out-of-unborn:
      git checkout -b: allow switching out of an unborn branch
  3. @gitster

    Merge branch 'jc/maint-mailmap-output' into maint

    gitster committed Feb 16, 2012
    * jc/maint-mailmap-output:
      mailmap: always return a plain mail address from map_user()
  4. @gitster

    Merge branch 'jk/prompt-fallback-to-tty' into maint

    gitster committed Feb 16, 2012
    * jk/prompt-fallback-to-tty:
      prompt: fall back to terminal if askpass fails
      prompt: clean up strbuf usage
  5. @gitster

    Merge branch 'jn/gitweb-search-utf-8' into maint

    gitster committed Feb 16, 2012
    * jn/gitweb-search-utf-8:
      gitweb: Allow UTF-8 encoded CGI query parameters and path_info
  6. @gitster

    Merge branch 'jc/maint-commit-ignore-i-t-a' into maint

    gitster committed Feb 16, 2012
    * jc/maint-commit-ignore-i-t-a:
      commit: ignore intent-to-add entries instead of refusing
    
    Conflicts:
    	cache-tree.c
  7. @gitster

    Merge branch 'mm/empty-loose-error-message' into maint

    gitster committed Feb 16, 2012
    * mm/empty-loose-error-message:
      fsck: give accurate error message on empty loose object files
  8. @gitster

    Merge branch 'nk/ctype-for-perf' into maint

    gitster committed Feb 16, 2012
    * nk/ctype-for-perf:
      ctype: implement islower/isupper macro
      ctype.c only wants git-compat-util.h
  9. @gitster

    Merge branch 'jx/i18n-more-marking' into maint

    gitster committed Feb 16, 2012
    * jx/i18n-more-marking:
      i18n: format_tracking_info "Your branch is behind" message
      i18n: git-commit whence_s "merge/cherry-pick" message
  10. @keszybz @gitster

    man: rearrange git synopsis to fit in 80 lines

    keszybz committed with gitster Feb 15, 2012
    The line was extended in 2dd8c3 ('git: add --info-path and --man-path
    options'), and the formatted man output stopped fitting into the 80
    column window.
    
    Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. @ralfth @gitster

    completion: --list option for git-branch

    ralfth committed with gitster Feb 15, 2012
    Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. @gitster

    Merge branch 'rt/completion-branch-edit-desc' into maint

    gitster committed Feb 16, 2012
    * rt/completion-branch-edit-desc:
      completion: --edit-description option for git-branch
Commits on Feb 14, 2012
  1. @gitster

    diff --stat: show bars of same length for paths with same amount of c…

    gitster committed Feb 14, 2012
    …hanges
    
    When commit 3ed74e6 (diff --stat: ensure at least one '-' for deletions,
    and one '+' for additions, 2006-09-28) improved the output for files with
    tiny modifications, we accidentally broke the logic to ensure that two
    equal sized changes are shown with the bars of the same length, even when
    rounding errors exist.
    
    Compute the length of the graph bars, using the same "non-zero changes is
    shown with at least one column" scaling logic, but by scaling the sum of
    additions and deletions to come up with the total length of the bar (this
    ensures that two equal sized changes result in bars of the same length),
    and then scaling the smaller of the additions or deletions. The other side
    is computed as the difference between the two.
    
    This makes the apportioning between additions and deletions less accurate
    due to rounding errors, but it is much less noticeable than two files with
    the same amount of change showing bars of different length.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Git 1.7.9.1

    gitster committed Feb 14, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'jk/maint-tag-show-fixes' into maint

    gitster committed Feb 13, 2012
    * jk/maint-tag-show-fixes:
      tag: do not show non-tag contents with "-n"
      tag: die when listing missing or corrupt objects
      tag: fix output of "tag -n" when errors occur
    
    Conflicts:
    	t/t7004-tag.sh
Something went wrong with that request. Please try again.