1. Stefan Saasen
  2. git

Commits

Author Commit Message Date Builds
Junio C Hamano
Git 1.7.11 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.11
Junio C Hamano
Sync with 1.7.10.5
Junio C Hamano
Git 1.7.10.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.10.5
Vincent van Ravesteijn
Do not autosquash in case of an implied interactive rebase The option to autosquash is only used in case of an interactive rebase. When merges are preserved, rebase uses an interactive rebase internally, but in this case autosquash should still be disabled. Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'js/maint-fast-export-mark-error' into maint "git fast-export" did not give a readable error message when the same mark erroneously appeared twice in the --import-marks input.
Junio C Hamano
Merge git://github.com/git-l10n/git-po Updated Italian translations. * git://github.com/git-l10n/git-po: l10n: it.po: translate 212 new messages
Junio C Hamano
Merge branch 'as/diff-shortstat-ignore-binary' # By Alexander Strasser * as/diff-shortstat-ignore-binary: diff: Only count lines in show_shortstats
Alexander Strasser
diff: Only count lines in show_shortstats Do not mix byte and line counts. Binary files have byte counts; skip them when accumulating line insertions/deletions. The regression was introduced in e18872b. Signed-off-by: Alexander Strasser <eclipse7@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King
do not run pager with diff --no-index --quiet There is no point in running a pager when --quiet is given, since we are producing no output. The regular diff code path handles this already, because --quiet implies --exit-code, and we check for --exit-code when deciding not to run the pager. However, the "quiet implies exit-code" logic is done in diff_setup_done, and the no-index code path sets up its pager before running diff_setup_done, and …
Jeff King
fix pager.diff with diff --no-index git-diff does not rely on the git wrapper to setup its pager; instead, it sets it up on its own after seeing whether --quiet or --exit-code has been specified. After diff_no_index was split off from cmd_diff, commit b3fde6c (git diff --no-index: default to page like other diff frontends, 2008-05-26) duplicated the one-liner from cmd_diff to turn on the pager. Later, commit 8f0359f (Allow pager o…
Jonathan Nieder
perl/Makefile: install Git::SVN::* when NO_PERL_MAKEMAKER=yes, too v1.7.11-rc1~12^2~2 (2012-05-27) and friends split some git-svn code into separate modules but did not update the fallback rules to install them when NO_PERL_MAKEMAKER is set. Add the appropriate rules so users without MakeMaker can use git-svn again. Affected modules: Git::SVN::Prompt, Git::SVN::Fetcher, Git::SVN::Editor, Git::SVN::Ra, Git::SVN::Memoize::YAML. Reported-by: Adam Roben <adam@robe…
Jonathan Nieder
perl/Makefile.PL: warn about duplicate module list in perl/Makefile Adding or removing a module requires modifying both files to support builds with and without MakeMaker. Add a comment to remind patch authors and reviewers at the crucial moment. Longer term, it would be nicer to maintain a single list, perhaps in a separate file used by both build systems. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Carlos Martín Nieto
git-cherry-pick.txt: clarify the use of revision range notation When given a set of commits, cherry-pick will apply the changes for all of them. Specifying a simple range will also work as expected. This can lead the user to think that git cherry-pick A B..C may apply A and then B..C, but that is not what happens. Instead the revs are given to a single invocation of rev-list, which will consider A and C as positive revs and B as a negative one. The co…
Carlos Martín Nieto
Documentation: --no-walk is no-op if range is specified The existing description can be misleading and cause the reader to think that --no-walk will do something if they specify a range in the command line instead of a set of revs. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Marco Paolone
l10n: it.po: translate 212 new messages Signed-off-by: Marco Paolone <marcopaolone@gmail.com> Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Junio C Hamano
revision: ignore side parents while running simplify-merges The simplify_merges() function needs to look at all history chain to find the closest ancestor that is relevant after the simplification, but after --first-parent traversal, side parents haven't been marked for relevance (they are irrelevant by definition due to the nature of first-parent-only traversal) nor culled from the parents list of resulting commits. We cannot simply remove these side par…
Junio C Hamano
Merge branch 'rj/gitweb-test-sans-date-parser' Regression fix to t9501 introduced at 0f3ddd4 * rj/gitweb-test-sans-date-parser: gitweb: Skip 'modification times' tests when no date parser available
Junio C Hamano
Merge branch 'fc/git-complete-helper-fix' * fc/git-complete-helper-fix: completion: put main git and gitk completion functions back into git namespace
Junio C Hamano
archive: ustar header checksum is computed unsigned POSIX.1 (pax) is pretty clear on this: The chksum field shall be the ISO/IEC 646:1991 standard IRV representation of the octal value of the simple sum of all octets in the header logical record. Each octet in the header shall be treated as an unsigned value. These values shall be added to an unsigned integer, initialized to zero, the precision of which is not less than 17 bits. When c…
SZEDER Gábor
completion: remove credential helpers from porcelain commands Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
SZEDER Gábor
completion: put main git and gitk completion functions back into git namespace Commit 7f02f3d7 (completion: rename internal helpers _git and _gitk, 2012-05-19) renamed said functions to _main_git() and _main_gitk(), respectively. By convention the name of our git-completion-specific functions start with '_git' or '__git' prefix, so rename those functions once again to put them back into our "namespace". Use the two underscore prefix, because _git_main() could be mistaken f…
Ramsay Jones
gitweb: Skip 'modification times' tests when no date parser available The If-Modified-Since support in Gitweb is conditional on the availability of a date parser from either the HTTP::Date or Time::ParseDate modules. If a suitable parser is not available, then the corresponding 'modification times' tests should be skipped. Introduce the DATE_PARSER test prerequisite and use it to skip all of the dependent tests. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co…
Vincent van Ravesteijn
t: Replace 'perl' by $PERL_PATH GIT-BUILD-OPTIONS defines PERL_PATH to be used in the test suite. Only a few tests already actually use this variable when perl is needed. The other test just call 'perl' and it might happen that the wrong perl interpreter is used. This becomes problematic on Windows, when the perl interpreter that is compiled and installed on the Windows system is used, because this perl interpreter might introd…
Junio C Hamano
Git 1.7.11-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge git://github.com/git-l10n/git-po Updates to German, Vietnamese and simplified Chinese translation. * git://github.com/git-l10n/git-po: l10n: de.po: translate 27 new messages l10n: Update po/vi.po to v1.7.11.rc2.2.gb694fbb l10n: zh_CN.po: translate 27 new messages l10n: Update git.pot (27 new, 1 removed messages)
Jiang Xin
Merge git://github.com/ralfth/git-po-de By Ralf Thielow via Ralf Thielow * github.com/ralfth/git-po-de: l10n: de.po: translate 27 new messages
Junio C Hamano
Merge branch 'mm/api-credentials-doc' * mm/api-credentials-doc: api-credential.txt: document that helpers field is filled-in automatically
Junio C Hamano
Merge branch 'jc/fmt-merge-msg-people' Tone down the lines that credit people involved and make them comments, so that integrators who edit their merge messages can still make use of the information, but lazy ones will not leave the unverified guesses placed on the "via" line. * jc/fmt-merge-msg-people: fmt-merge-msg: make attribution into comment lines
Matthieu Moy
api-credential.txt: document that helpers field is filled-in automatically It was unclear whether the field was to be specified by the user of the API. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'js/maint-fast-export-mark-error' * js/maint-fast-export-mark-error: fast-export: report SHA-1 instead of gibberish when marks exist already
  1. Prev
  2. Next