Permalink
Commits on May 11, 2012
  1. Git 1.7.10.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed May 11, 2012
  2. Merge branch 'jc/diff-algo-cleanup' into maint

    * jc/diff-algo-cleanup:
      xdiff: PATIENCE/HISTOGRAM are not independent option bits
      xdiff: remove XDL_PATCH_* macros
    gitster committed May 11, 2012
  3. Merge branch 'ct/advise-push-default' into maint

    The cases "git push" fails due to non-ff can be broken into three
    categories; each case is given a separate advise message.
    
    By Christopher Tiwald (2) and Jeff King (1)
    * ct/advise-push-default:
      Fix httpd tests that broke when non-ff push advice changed
      clean up struct ref's nonfastforward field
      push: Provide situational hints for non-fast-forward errors
    gitster committed May 11, 2012
  4. Merge branch 'js/fast-import-test-9300' into maint

    By Johannes Sixt
    * js/fast-import-test-9300:
      t9300-fast-import: avoid 'exit' in test_expect_success snippets
    gitster committed May 11, 2012
  5. Merge branch 'jk/repack-no-explode-objects-from-old-pack' into maint

    "git repack" used to write out unreachable objects as loose objects
    when repacking, even if such loose objects will immediately pruned
    due to its age.
    
    By Jeff King
    * jk/repack-no-explode-objects-from-old-pack:
      gc: use argv-array for sub-commands
      argv-array: add a new "pushl" method
      argv-array: refactor empty_argv initialization
      gc: do not explode objects which will be immediately pruned
    gitster committed May 11, 2012
  6. Merge branch 'ah/maint-grep-double-init' into maint

    By Angus Hammond
    * ah/maint-grep-double-init:
      grep.c: remove redundant line of code
    gitster committed May 11, 2012
  7. Merge branch 'fa/maint-config-doc' into maint

    By Florian Achleitner
    * fa/maint-config-doc:
      Documentation/git-config: describe and clarify "--local <file>" option
    gitster committed May 11, 2012
  8. Merge branch 'rs/unpack-trees-leakfix' into maint

    By René Scharfe
    * rs/unpack-trees-leakfix:
      unpack-trees: plug minor memory leak
      unpack-trees: don't perform any index operation if we're not merging
    gitster committed May 11, 2012
  9. Merge branch 'sl/test-wc-l-line-count' into maint

    By Stefano Lattarini
    * sl/test-wc-l-line-count:
      tests: modernise style: more uses of test_line_count
    gitster committed May 11, 2012
  10. Merge branch 'rl/show-empty-prefix' into maint

    Unlike "git rev-parse --show-cdup", "--show-prefix" did not give an
    empty line when run at the top of the working tree.
    
    By Ross Lagerwall
    * rl/show-empty-prefix:
      rev-parse --show-prefix: add in trailing newline
    gitster committed May 11, 2012
  11. document submdule.$name.update=none option for gitmodules

    This option was not yet described in the gitmodules documentation. We
    only described it in the 'git submodule' command documentation but
    gitmodules is the more natural place to look.
    
    A short reference in the 'git submodule' documentation should be
    sufficient since the details can now be found in the documentation to
    gitmodules.
    
    Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Heiko Voigt committed with gitster May 10, 2012
Commits on May 10, 2012
  1. Update draft release notes to 1.7.10.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed May 10, 2012
  2. Merge branch 'mm/include-userpath' into maint

    By Jeff King
    * mm/include-userpath:
      config: expand tildes in include.path variable
    gitster committed May 10, 2012
  3. Merge branch 'cc/fix-missing-va-end-in-revert' into maint

    By Christian Couder
    * cc/fix-missing-va-end-in-revert:
      revert: add missing va_end
    gitster committed May 10, 2012
  4. Merge branch 'bw/test-fix-grep-gnuism' into maint

    * bw/test-fix-grep-gnuism:
      t9400: fix gnuism in grep
    gitster committed May 10, 2012
  5. Merge branch 'jk/http-backend-keep-committer-ident-env' into maint

    By Jeff King
    * jk/http-backend-keep-committer-ident-env:
      http-backend: respect existing GIT_COMMITTER_* variables
    
    Conflicts:
    	t/t5541-http-push.sh
    gitster committed May 10, 2012
  6. Merge branch 'nl/rebase-i-cheat-sheet' into maint

    * nl/rebase-i-cheat-sheet:
      rebase -i: remind that the lines are top-to-bottom
    gitster committed May 10, 2012
  7. Merge branch 'bw/submodule-sed-solaris' into maint

    By Ben Walton
    * bw/submodule-sed-solaris:
      Avoid bug in Solaris xpg4/sed as used in submodule
    gitster committed May 10, 2012
  8. Merge branch 'jk/maint-push-progress' into maint

    "git push" over smart-http lost progress output a few releases ago.
    
    By Jeff King
    * jk/maint-push-progress:
      t5541: test more combinations of --progress
      teach send-pack about --[no-]progress
      send-pack: show progress when isatty(2)
    gitster committed May 10, 2012
  9. Merge branch 'jc/rerere-train' into maint

    A contrib script "rerere-train" did not work out of the box unless user
    futzed with her $PATH.
    
    * jc/rerere-train:
      contrib/rerere-train: use installed git-sh-setup
    gitster committed May 10, 2012
  10. Merge branch 'lp/diffstat-with-graph' into maint

    "log --graph" was not very friendly with "--stat" option and its output
    had line breaks at wrong places.
    
    By Lucian Poston (5) and Zbigniew Jędrzejewski-Szmek (3)
    * lp/diffstat-with-graph:
      t4052: work around shells unable to set COLUMNS to 1
      test-lib: skip test with COLUMNS=1 under mksh
      Prevent graph_width of stat width from falling below min
      t4052: Test diff-stat output with minimum columns
      t4052: Adjust --graph --stat output for prefixes
      Adjust stat width calculations to take --graph output into account
      Add output_prefix_length to diff_options
      t4052: test --stat output with --graph
    gitster committed May 10, 2012
Commits on May 7, 2012
  1. Documentation/git-config: describe and clarify "--local <file>" option

    Describe config file selection in git-config.  While the usage message of
    git-config shows --local, the documentation page did not contain anything
    about that.
    
    Signed-off-by: Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Florian Achleitner committed with gitster May 5, 2012
  2. Start preparing for 1.7.10.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed May 7, 2012
  3. Merge branch 'jk/maint-gitweb-test-use-sane-perl' into maint

    When using a Perl script on a system where "perl" found on user's $PATH
    could be ancient or otherwise broken, we allow builders to specify the
    path to a good copy of Perl with $PERL_PATH.  The gitweb test forgot to
    use that Perl when running its test.
    
    By Jeff King (1) and Zbigniew Jędrzejewski-Szmek (1)
    * jk/maint-gitweb-test-use-sane-perl:
      Consistently use perl from /usr/bin/ for scripts
      t/gitweb-lib: use $PERL_PATH to run gitweb
    gitster committed May 7, 2012
  4. Merge branch 'js/daemon-test-race-fix' into maint

    The test scaffolding for git-daemon was flaky.
    
    By Johannes Sixt
    * js/daemon-test-race-fix:
      t5570: fix forwarding of git-daemon messages via cat
    gitster committed May 7, 2012
  5. Merge branch 'jk/maint-config-bogus-section' into maint

    "git config --rename-section" to rename an existing section into a bogus
    one did not check the new name.
    
    By Jeff King
    * jk/maint-config-bogus-section:
      config: reject bogus section names for --rename-section
    gitster committed May 7, 2012
  6. Merge branch 'pw/t5800-import-race-fix' into maint

    The test scaffolding for fast-import was flaky.
    
    By Pete Wyckoff
    * pw/t5800-import-race-fix:
      git-remote-testgit: fix race when spawning fast-import
    gitster committed May 7, 2012
  7. Merge branch 'rt/cherry-revert-conflict-summary' into maint

    In the older days, the header "Conflicts:" in "cherry-pick" and "merge"
    was separated by a blank line from the list of paths that follow for
    readability, but when "merge" was rewritten in C, we lost it by
    mistake. Remove the newline from "cherry-pick" to make them match again.
    
    By Ralf Thielow
    * rt/cherry-revert-conflict-summary:
      sequencer: remove additional blank line
    gitster committed May 7, 2012
  8. Merge branch 'cb/maint-report-mount-point-correctly-in-setup' into maint

    The filesystem boundary was not correctly reported when .git directory
    discovery stopped at a mount point.
    
    By Clemens Buchacher
    * cb/maint-report-mount-point-correctly-in-setup:
      properly keep track of current working directory
    gitster committed May 7, 2012
  9. grep.c: remove redundant line of code

    Signed-off-by: Angus Hammond <angusgh@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Mjiig committed with gitster May 6, 2012
  10. git p4 doc: fix formatting

    Attach example sections to previous level of indenting.
    
    Fix a trailing ::
    
    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Pete Wyckoff committed with gitster May 6, 2012
Commits on May 3, 2012
  1. Merge branch 'jc/merge-reduce-parents-early' into maint

    Octopus merge strategy did not reduce heads that are recorded in the final
    commit correctly.
    
    By Junio C Hamano (4) and Michał Kiedrowicz (1)
    * jc/merge-reduce-parents-early:
      fmt-merge-msg: discard needless merge parents
      builtin/merge.c: reduce parents early
      builtin/merge.c: collect other parents early
      builtin/merge.c: remove "remoteheads" global variable
      merge tests: octopus with redundant parents
    gitster committed May 3, 2012
  2. Merge branch 'cb/cherry-pick-rev-path-confusion' into maint

    The command line parser choked "git cherry-pick $name" when $name can be
    both revision name and a pathname, even though $name can never be a path
    in the context of the command.
    
    By Clemens Buchacher
    * cb/cherry-pick-rev-path-confusion:
      cherry-pick: do not expect file arguments
    gitster committed May 3, 2012
  3. Merge branch 'cb/http-multi-curl-auth' into maint

    HTTP transport that requires authentication did not work correctly when
    multiple connections are used simultaneously.
    
    By Jeff King (3) and Clemens Buchacher (1)
    * cb/http-multi-curl-auth:
      http: use newer curl options for setting credentials
      http: clean up leak in init_curl_http_auth
      fix http auth with multiple curl handles
      http auth fails with multiple curl handles
    gitster committed May 3, 2012
  4. Merge branch 'mb/fetch-call-a-non-branch-a-ref' into maint

    The report from "git fetch" said "new branch" even for a non branch ref.
    
    By Marc Branchaud
    * mb/fetch-call-a-non-branch-a-ref:
      fetch: describe new refs based on where it came from
      fetch: Give remote_ref to update_local_ref() as well
    gitster committed May 3, 2012