- 15 12月, 2010 9 次提交
-
-
git://git.kernel.org/pub/scm/gitk/gitk由 Junio C Hamano 提交于
* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Add Brazilian Portuguese (pt-BR) translation gitk: Make text selectable on Mac gitk: Prevent the text pane from becoming editable gitk: Add the equivalent of diff --color-words gitk: Update Swedish translation (290t) gitk: Show notes by default (like git log does)
-
由 Junio C Hamano 提交于
* maint: Prepare for 1.7.3.4 use persistent memory for rejected paths do not overwrite files in leading path lstat_cache: optionally return match_len add function check_ok_to_remove() t7607: add leading-path tests t7607: use test-lib functions and check MERGE_HEAD Do not link with -lcrypto under NO_OPENSSL Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Clemens Buchacher 提交于
An aborted merge prints the list of rejected paths as part of the error message. Since commit f66caaf9 (do not overwrite files in leading path), some of those paths do not have static buffers, so we have to keep a copy. Use string_list's to accomplish this. This changes the order of the list to the order in which the paths are processed. Previously, it was reversed. Signed-off-by: NClemens Buchacher <drizzd@aon.at> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Clemens Buchacher 提交于
If the work tree contains an untracked file x, and unpack-trees wants to checkout a path x/*, the file x is removed unconditionally. Instead, apply the same checks that are normally used for untracked files, and abort if the file cannot be removed. Signed-off-by: NClemens Buchacher <drizzd@aon.at> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Clemens Buchacher 提交于
Return match_len so that the caller can know which leading path component matched. Signed-off-by: NClemens Buchacher <drizzd@aon.at> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Clemens Buchacher 提交于
This wraps some inline code into the function check_ok_to_remove(), which will later be used for leading path components as well. Signed-off-by: NClemens Buchacher <drizzd@aon.at> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Clemens Buchacher 提交于
Signed-off-by: NClemens Buchacher <drizzd@aon.at> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Clemens Buchacher 提交于
Use the test_commit and test_path_is_missing functions from the test library. Also make sure that a merge which fails due to pre-merge checks aborts properly and does not leave MERGE_HEAD behind. The "will not overwrite removed file" test is an exception to this. It notices the untracked file at a stage where the merge is already well under way. Therefore we cannot abort the merge without major restructuring. See the following thread for more details. http://mid.gmane.org/7vskopwxej.fsf@gitster.siamese.dyndns.orgSigned-off-by: NClemens Buchacher <drizzd@aon.at> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 14 12月, 2010 12 次提交
-
-
由 Junio C Hamano 提交于
* jc/maint-no-openssl-build-fix: Do not link with -lcrypto under NO_OPENSSL
-
由 Junio C Hamano 提交于
* ja/maint-pull-rebase-doc: git-pull.txt: Mention branch.autosetuprebase
-
由 Junio C Hamano 提交于
* tc/http-urls-ends-with-slash: http-fetch: rework url handling http-push: add trailing slash at arg-parse time, instead of later on http-push: check path length before using it http-push: Normalise directory names when pushing to some WebDAV servers http-backend: use end_url_with_slash() url: add str wrapper for end_url_with_slash() shift end_url_with_slash() from http.[ch] to url.[ch] t5550-http-fetch: add test for http-fetch t5550-http-fetch: add missing '&&'
-
由 Junio C Hamano 提交于
* nd/maint-hide-checkout-index-from-error: entry.c: remove "checkout-index" from error messages
-
由 Junio C Hamano 提交于
* jk/maint-reflog-bottom: reflogs: clear flags properly in corner case
-
由 Junio C Hamano 提交于
* mz/rebase-abort-reflog-fix: rebase --abort: do not update branch ref
-
由 Junio C Hamano 提交于
* mz/maint-rebase-stat-config: rebase: only show stat if configured to true
-
由 Junio C Hamano 提交于
* gc/http-with-non-ascii-username-url: Fix username and password extraction from HTTP URLs t5550: test HTTP authentication and userinfo decoding Conflicts: t/lib-httpd/apache.conf
-
由 Alexandre Erwin Ittner 提交于
Translating a SCM is tricky due to amount of jargon, so, I tried to keep the wording consistent with both the German and Italian git translations and the pt-BR translation of other SCMs. Signed-off-by: NAlexandre Erwin Ittner <alexandre@ittner.com.br> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-
由 Michael J Gruber 提交于
Currently we have three test files matching t800?-blame.sh. Rename the latter two to make it easier to spot where additions would go. Signed-off-by: NMichael J Gruber <git@drmicha.warpmail.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jeff King 提交于
All tests are supposed to be executable. Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jeff King 提交于
There are some common but minor errors we tend to make in writing test scripts: 1. Scripts are left non-executable. This is not usually noticed immediately because "make test" does not need the bit, but it is a matter of git policy to make them executable (and is a slight convenience when running individual scripts). 2. Two scripts are allocated the same number. Usually this happens on separate branches, and the problem only comes about during a merge. But since there is no textual conflict, the merger would have to be very observant to notice. This is also a minor error, but can make GIT_SKIP_TESTS ambiguous. This patch introduces a "test-lint" target which checks both. It is not invoked by default. You can invoke it as "make test-lint", or you can make it a prerequisite of running the tests by specifying "TEST_LINT = test-lint" in your config.mak or on the command line. Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 13 12月, 2010 18 次提交
-
-
由 Johannes Sixt 提交于
Signed-off-by: NJohannes Sixt <j6t@kdbg.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* ja/maint-pull-rebase-doc: git-pull.txt: Mention branch.autosetuprebase
-
由 Junio C Hamano 提交于
* gb/web--browse: web--browse: better support for chromium web--browse: support opera, seamonkey and elinks web--browse: split valid_tool list web--browse: coding style
-
由 Junio C Hamano 提交于
* jn/parse-options-extra: update-index: migrate to parse-options API setup: save prefix (original cwd relative to toplevel) in startup_info parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION parse-options: allow git commands to invent new option types parse-options: never suppress arghelp if LITERAL_ARGHELP is set parse-options: do not infer PARSE_OPT_NOARG from option type parse-options: sanity check PARSE_OPT_NOARG flag parse-options: move NODASH sanity checks to parse_options_check parse-options: clearer reporting of API misuse parse-options: Don't call parse_options_check() so much
-
由 Junio C Hamano 提交于
* js/configurable-tab: Make the tab width used for whitespace checks configurable apply --whitespace=fix: fix tab-in-indent
-
由 Junio C Hamano 提交于
* nd/maint-hide-checkout-index-from-error: entry.c: remove "checkout-index" from error messages
-
由 Junio C Hamano 提交于
* jn/gitweb-per-request-config: gitweb: document $per_request_config better gitweb: selectable configurations that change with each request
-
由 Junio C Hamano 提交于
* ef/help-cmd-prefix: help: always suggest common-cmds if prefix of cmd
-
由 Junio C Hamano 提交于
* tc/http-urls-ends-with-slash: http-fetch: rework url handling http-push: add trailing slash at arg-parse time, instead of later on http-push: check path length before using it http-push: Normalise directory names when pushing to some WebDAV servers http-backend: use end_url_with_slash() url: add str wrapper for end_url_with_slash() shift end_url_with_slash() from http.[ch] to url.[ch] t5550-http-fetch: add test for http-fetch t5550-http-fetch: add missing '&&'
-
由 Junio C Hamano 提交于
* tc/format-patch-p: format-patch: page output with --stdout
-
由 Junio C Hamano 提交于
* ef/win32-dirent: win32: use our own dirent.h msvc: opendir: handle paths ending with a slash win32: dirent: handle errors msvc: opendir: do not start the search msvc: opendir: allocate enough memory msvc: opendir: fix malloc-failure Conflicts: Makefile
-
由 Junio C Hamano 提交于
* mz/rebase-i-verify: rebase: support --verify
-
由 Junio C Hamano 提交于
* mz/rebase-abort-reflog-fix: rebase --abort: do not update branch ref
-
由 Junio C Hamano 提交于
* jk/maint-reflog-bottom: reflogs: clear flags properly in corner case
-
由 Junio C Hamano 提交于
* jk/asciidoc-update: docs: default to more modern toolset
-
由 Junio C Hamano 提交于
* mz/pull-rebase-rebased: Use reflog in 'pull --rebase . foo'
-
由 Junio C Hamano 提交于
* mz/maint-rebase-stat-config: rebase: only show stat if configured to true
-
由 Junio C Hamano 提交于
* jn/git-cmd-h-bypass-setup: update-index -h: show usage even with corrupt index merge -h: show usage even with corrupt index ls-files -h: show usage even with corrupt index gc -h: show usage even with broken configuration commit/status -h: show usage even with broken configuration checkout-index -h: show usage even in an invalid repository branch -h: show usage even in an invalid repository Conflicts: builtin/merge.c
-
- 12 12月, 2010 1 次提交
-
-
由 Stefan Haller 提交于
Stolen from git-gui, 23effa79 (original log message by Shawn O. Pearce <spearce@spearce.org> follows): git-gui: Force focus to the diff viewer on mouse click. Apparently a "feature" of Tcl/Tk on Mac OS X is that a disabled text widget cannot receive focus or receive a selection within it. This makes the diff viewer almost useless on that platform as you cannot select individual parts of the buffer. Now we force focus into the diff viewer when its clicked on with button 1. This works around the feature and allows selection to work within the viewer just like it does on other less sane systems, like Microsoft Windows. Signed-off-by: NStefan Haller <stefan@haller-berlin.de> Signed-off-by: NPaul Mackerras <paulus@samba.org>
-