- 09 5月, 2010 13 次提交
-
-
由 Junio C Hamano 提交于
* eb/unpretty-b-format: Add `%B' in format strings for raw commit body in `git log' and friends
-
由 Junio C Hamano 提交于
* ab/commit-empty-message: Add option to git-commit to allow empty log messages
-
由 Junio C Hamano 提交于
* jc/test-sleepless: war on "sleep" in tests
-
由 Junio C Hamano 提交于
* jc/maint-reflog-expire-unreachable: reflog --expire-unreachable: avoid merge-base computation
-
由 Junio C Hamano 提交于
* sd/log-decorate: log.decorate: only ignore it under "log --pretty=raw" script with rev-list instead of log log --pretty/--oneline: ignore log.decorate log.decorate: usability fixes Add `log.decorate' configuration variable. git_config_maybe_bool() Conflicts: builtin/log.c
-
由 Junio C Hamano 提交于
* mh/status-optionally-refresh: t7508: add a test for "git status" in a read-only repository git status: refresh the index if possible t7508: add test for "git status" refreshing the index
-
由 Junio C Hamano 提交于
* cw/ws-indent-with-tab: whitespace: tests for git-apply --whitespace=fix with tab-in-indent whitespace: add tab-in-indent support for --whitespace=fix whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst whitespace: tests for git-diff --check with tab-in-indent error class whitespace: add tab-in-indent error class whitespace: we cannot "catch all errors known to git" anymore
-
由 Junio C Hamano 提交于
* cc/revert-strategy: revert: add "--strategy" option to choose merge strategy merge: make function try_merge_command non static merge: refactor code that calls "git merge-STRATEGY" revert: refactor merge recursive code into its own function revert: use strbuf to refactor the code that writes the merge message Conflicts: builtin/revert.c
-
由 Junio C Hamano 提交于
* sc/http-late-auth: Prompt for a username when an HTTP request 401s
-
由 Junio C Hamano 提交于
* jk/cached-textconv: diff: avoid useless filespec population diff: cache textconv output textconv: refactor calls to run_textconv introduce notes-cache interface make commit_tree a library function
-
由 Junio C Hamano 提交于
* pc/remove-warn: Remove a redundant errno test in a usage of remove_path Introduce remove_or_warn function Implement the rmdir_or_warn function Generalise the unlink_or_warn function
-
由 Jonathan Nieder 提交于
When cherry-picking, usually the new and old commit encodings are both UTF-8. Most old iconv implementations do not support this trivial conversion, so on old platforms, out->message remains NULL, and later attempts to read it segfault. Fix this by noticing the input and output encodings match and skipping the iconv step, like the other reencode_string() call sites already do. Also stop segfaulting on other iconv failures: if iconv fails for some other reason, the best we can do is to pass the old message through. This fixes a regression introduced in v1.7.1-rc0~15^2~2 (revert: clarify label on conflict hunks, 2010-03-20). Reported-by: NAndreas Krey <a.krey@gmx.de> Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Ramsay Jones 提交于
In particular the gitweb/GITWEB-BUILD-OPTIONS file was not being removed by the main Makefile. However, the gitweb/Makefile has a 'clean' target that correctly removes all the build products. In order to fix the problem, rather than duplicate the clean-up instructions, we change the main Makefile so that it delegates the clean-up actions to the gitweb Makefile. Signed-off-by: NRamsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: NJakub Narebski <jnareb@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 08 5月, 2010 1 次提交
-
-
由 Leif Arne Storset 提交于
The documentation erroneously mentions the GIT_NOTES_REWRITE_REF override in the description of notes.rewrite.<command>. Move it under notes.rewriteRef where it belongs. Signed-off-by: NLeif Arne Storset <lstorset@opera.com> Acked-by: NThomas Rast <trast@student.ethz.ch> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 07 5月, 2010 1 次提交
-
-
由 Jonathan Nieder 提交于
In 3bf78867 (test-lib: Let tests specify commands to be run at end of test, 2010-05-02), the git test harness learned to run cleanup commands unconditionally at the end of a test. During each test, the intended cleanup actions are collected in the test_cleanup variable and evaluated. That variable looks something like this: eval_ret=$?; clean_something && (exit "$eval_ret") eval_ret=$?; clean_something_else && (exit "$eval_ret") eval_ret=$?; final_cleanup && (exit "$eval_ret") eval_ret=$? All cleanup actions are run unconditionally but if one of them fails it is properly reported through $eval_ret. On FreeBSD, unfortunately, $? is set at the beginning of an ‘eval’ to 0 instead of the exit status of the previous command. This results in tests using test_expect_code appearing to fail and all others appearing to pass, unless their cleanup fails. Avoid the problem by setting eval_ret before the ‘eval’ begins. Thanks to Jeff King for the explanation. Cc: Jeff King <peff@peff.net> Cc: Johannes Sixt <j6t@kdbg.org> Acked-by: NJeff King <peff@peff.net> Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 05 5月, 2010 6 次提交
-
-
由 Jonathan Nieder 提交于
Certain actions can imply that if the test fails early, recovery from within other tests is too much to expect: - creating unwritable directories, like the EACCESS test in t0001-init - setting unusual configuration, like user.signingkey in t7004-tag - crashing and leaving the index lock held, like t3600-rm once did Some test scripts work around this by running cleanup actions outside the supervision of the test harness, with the unfortunate consequence that those commands are not appropriately echoed and their output not suppressed. Others explicitly save exit status, clean up, and then reset the exit status within the tests, which has excellent behavior but makes the tests hard to read. Still others ignore the problem. Allow tests a fourth option: by calling this function, tests can stack up commands they would like to be run to clean up. Commands passed to test_when_finished during a test are unconditionally run in the test environment immediately before the test is completed, in last-in-first-out order. If some cleanup command fails, then the other cleanup commands are still run before the failure is reported and the test script allowed to continue. Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint-1.7.0: remove ecb parameter from xdi_diff_outf()
-
由 René Scharfe 提交于
xdi_diff_outf() overrides the structure members of its last parameter, ignoring any value that callers pass in. It's no surprise then that all callers pass a pointer to an uninitialized structure. They also don't read it after the call, so the parameter is neither used for input nor for output. Turn it into a local variable of xdi_diff_outf(). Signed-off-by: NRene Scharfe <rene.scharfe@lsrfire.ath.cx> Acked-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Ping Yin 提交于
Signed-off-by: NPing Yin <pkufranky@gmail.com> Acked by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Currently, a local git clone reports only initializing an empty git dir, which is potentially confusing. Instead, report that cloning is in progress and when it is done (unless -q) is given, and suppress the init report. Signed-off-by: NMichael J Gruber <git@drmicha.warpmail.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Michal Sojka 提交于
Dear Junio, this is a resend of relicensing patch for test suite library, which was initially sent by Carl Worth. Since the time you sent me acks for this patch collected by you, I collected 8 additional acks as is documented at https://git.wiki.kernel.org/index.php/Test-lib_reclicensing. There are still three contributors missing: Bert Wesarg, Stephan Beyer and Bryan Donlan. The contributions of first two are clearly not copyrightable. I'm not sure about the copyrightability of Bryan Donlan's contributions (git log -p --author='Bryan Donlan' t/test-lib.sh). Carl told me that in your ack collection process you missed only three acks. So I wonder whether you already did some analysis of which contributions are copyrightable. If so, are the missing acks in the list bellow? Thanks Michal 8<--------8<--------8<-------- This file has had no explicit license information noted in it, but has clearly been created and modified according to the terms of GPLv2 as with the rest of the git code base. The purpose of relicensing is to allow other GPLv3+ projects (in particular, the notmuch project: http://notmuchmail.org) to use this same test-suite structure and to contribute changes back as well. Signed-off-by: NCarl Worth <cworth@cworth.org> Signed-off-by: NMichal Sojka <sojkam1@fel.cvut.cz> Acked-by: NAlex Riesen <raa.lkml@gmail.com> Acked-by: NBrandon Casey <drafnel@gmail.com> Acked-by: NClemens Buchacher <drizzd@aon.at> Acked-by: NDavid Reiss <dreiss@facebook.com> Acked-by: NEmil Sit <sit@emilsit.net> Acked-by: NEric Wong <normalperson@yhbt.net> Acked-by: NFredrik Kuivinen <frekui@gmail.com> Acked-by: NGerrit Pape <pape@smarden.org> Acked-by: NChristian Couder <chriscool@tuxfamily.org> Acked-by: NJakub Narebski <jnareb@gmail.com> Acked-by: NJeff King <peff@peff.net> Acked-by: NJohan Herland <johan@herland.net> Acked-by: NJohannes Schindelin <Johannes.Schindelin@gmx.de> Acked-by: NJohannes Sixt <j6t@kdbg.org> Acked-by: NJonathan Nieder <jrnieder@gmail.com> Acked-by: NJosh Triplett <josh@joshtriplett.org> Acked-by: NJunio C Hamano <gitster@pobox.com> Acked-by: NLea Wiemann <lewiemann@gmail.com> Acked-by: NMarkus Heidelberg <markus.heidelberg@web.de> Acked-by: NMartin Waitz <tali@admingilde.org> Acked-by: NMatthew Ogilvie <mmogilvi_git@miniinfo.net> Acked-by: NMatthias Lederhofer <matled@gmx.net> Acked-by: NMichael J Gruber <git@drmicha.warpmail.net> Acked-by: NMichele Ballabio <barra_cuda@katamail.com> Acked-by: NMiklos Vajna <vmiklos@frugalware.org> Acked-by: NNicolas Pitre <nico@fluxnic.net> Acked-by: NPavel Roskin <proski@gnu.org> Acked-by: NPetr Baudis <pasky@ucw.cz> Acked-by: NPierre Habouzit <madcoder@debian.org> Acked-by: NRobin Rosenberg <robin.rosenberg@dewire.com> Acked-by: NShawn O. Pearce <spearce@spearce.org> Acked-by: NStephen Boyd <bebarino@gmail.com> Acked-by: NSverre Rabbelier <srabbelier@gmail.com> Acked-by: NThomas Rast <trast@student.ethz.ch> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 02 5月, 2010 5 次提交
-
-
由 Sverre Rabbelier 提交于
Signed-off-by: NSverre Rabbelier <srabbelier@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: index-pack: fix trivial typo in usage string git-submodule.sh: properly initialize shell variables
-
由 Michael J Gruber 提交于
Signed-off-by: NMichael J Gruber <git@drmicha.warpmail.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Gerrit Pape 提交于
git-submodule inherits variables from the environment it is started in, expects the internal variables init= and recursive= to have an empty value, but doesn't initialize them appropriately. Thanks to the selftests, this can be reproduced through init=1 make test recursive=1 make test With this commit the variables are initialized, and the selftests succeed even if these variables have some values in the environment. The bug was discovered through the Debian autobuilders http://bugs.debian.org/569594Signed-off-by: NGerrit Pape <pape@smarden.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Alexey Mahotkin 提交于
memset() is heavily optimized, and resulting assembler code is about 150 lines less for that file. Signed-off-by: NAlexey Mahotkin <squadette@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 24 4月, 2010 3 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: Documentation improvements for the description of short format.
-
由 Eric Raymond 提交于
Incorporates the detailed explanation from Jeff King in <20100410040959.GA11977@coredump.intra.peff.net> and fixes the bug noted by Junio C Hamano in <7vmxxc1i8g.fsf@alter.siamese.dyndns.org>. Signed-off-by: NEric S. Raymond <esr@thyrsus.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 23 4月, 2010 6 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* mg/use-default-abbrev-length-in-rev-list: rev-list: use default abbrev length when abbrev-commit is in effect
-
由 Junio C Hamano 提交于
* wp/doc-filter-direction: documentation: clarify direction of core.autocrlf
-
由 Junio C Hamano 提交于
* jk/maint-diffstat-overflow: diff: use large integers for diffstat calculations
-
由 Junio C Hamano 提交于
* da/maint-python-startup: Makefile: Remove usage of deprecated Python "has_key" method
-
- 22 4月, 2010 2 次提交
-
-
由 Junio C Hamano 提交于
* maint: Documentation/Makefile: fix interrupted builds of user-manual.xml
-
由 Jonathan Nieder 提交于
Unlike gcc, asciidoc does not atomically write its output file or delete it when interrupted. If it is interrupted in the middle of writing an XML file, the result will be truncated input for xsltproc. XSLTPROC user-manual.html user-manual.xml:998: parser error : Premature end of data in t Take care of this case by writing to a temporary and renaming it when finished. Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 20 4月, 2010 3 次提交
-
-
由 Junio C Hamano 提交于
* maint: t7012: Mark missing tests as TODO reflog: remove 'show' from 'expire's usage string MSVC: Fix build by adding missing termios.h dummy
-
由 Michael J Gruber 提交于
Currently, there are 6 tests which are not even written but are 'test_expect_failure message false'. Do not abuse test_expect_failure as a to do marker, but mark them as '#TODO' instead. Signed-off-by: NMichael J Gruber <git@drmicha.warpmail.net> Acked-by: NNguyen Thai Ngoc Duy <pclouds@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 SZEDER Gábor 提交于
Most of 'expire's options are not recognized by the 'show' subcommand, hence it errors out. Signed-off-by: NSZEDER Gábor <szeder@ira.uka.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-