Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Git 1.7.10.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.10.2
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
Merge branch 'ah/maint-grep-double-init' into maint By Angus Hammond * ah/maint-grep-double-init: grep.c: remove redundant line of code
Junio C Hamano
Merge branch 'fa/maint-config-doc' into maint By Florian Achleitner * fa/maint-config-doc: Documentation/git-config: describe and clarify "--local <file>" option
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Heiko Voigt
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 …
Junio C Hamano
Update draft release notes to 1.7.10.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'mm/include-userpath' into maint By Jeff King * mm/include-userpath: config: expand tildes in include.path variable
Junio C Hamano
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
Junio C Hamano
Merge branch 'bw/test-fix-grep-gnuism' into maint * bw/test-fix-grep-gnuism: t9400: fix gnuism in grep
Junio C Hamano
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
Junio C Hamano
Merge branch 'nl/rebase-i-cheat-sheet' into maint * nl/rebase-i-cheat-sheet: rebase -i: remind that the lines are top-to-bottom
Junio C Hamano
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
Junio C Hamano
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)
Junio C Hamano
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
Junio C Hamano
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 colum…
Florian Achleitner
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>
Junio C Hamano
Start preparing for 1.7.10.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
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/g…
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Angus Hammond
grep.c: remove redundant line of code Signed-off-by: Angus Hammond <angusgh@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
  1. Prev
  2. Next