- 22 7月, 2013 6 次提交
-
-
由 Junio C Hamano 提交于
* mm/merge-in-dirty-worktree-doc: Documentation/git-merge.txt: weaken warning about uncommited changes
-
由 Junio C Hamano 提交于
* ph/builtin-srcs-are-in-subdir-these-days: fix "builtin-*" references to be "builtin/*"
-
由 Junio C Hamano 提交于
* ft/doc-git-transport: documentation: add git:// transport security notice
-
由 Junio C Hamano 提交于
* mh/maint-lockfile-overflow: lockfile: fix buffer overflow in path handling
-
由 Junio C Hamano 提交于
Avoid failing "git diff" when core.safecrlf is set to true, because the user cannot tell where the breakage is in preparation for fixing and committing. * jc/maint-diff-core-safecrlf: diff: demote core.safecrlf=true to core.safecrlf=warn
-
由 Vitor Antunes 提交于
This test confirms that a file can be ignored during git p4 sync if if is excluded in P4 client specification. Signed-off-by: NVitor Antunes <vitor.hda@gmail.com> Acked-by: NPete Wyckoff <pw@padd.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 20 7月, 2013 22 次提交
-
-
由 Junio C Hamano 提交于
Hopefully this will be the final maintenance release before we go to feature freeze for 1.8.4.
-
由 Stefan Beller 提交于
The variable len is set to len = strchrnul(line, '\n') - line; unconditionally 9 lines later, hence we can remove the call to strlen. Signed-off-by: NStefan Beller <stefanbeller@googlemail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Stefan Beller 提交于
That pointer will be assigned to new memory via request = xmalloc(sizeof(*request)); 20 lines later unconditionally anyway, so it's safe to not assign it to an arbitrary variable. Signed-off-by: NStefan Beller <stefanbeller@googlemail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* tr/test-lint-no-export-assignment-in-shell: test-lint: detect 'export FOO=bar' t9902: fix 'test A == B' to use = operator
-
由 Junio C Hamano 提交于
* rr/name-rev-stdin-doc: name-rev doc: rewrite --stdin paragraph
-
由 Junio C Hamano 提交于
* ft/diff-rename-default-score-is-half: diff-options: document default similarity index
-
由 Junio C Hamano 提交于
* jc/t1512-fix: get_short_sha1(): correctly disambiguate type-limited abbreviation t1512: correct leftover constants from earlier edition
-
由 Junio C Hamano 提交于
* vl/typofix: random typofixes (committed missing a 't', successful missing an 's')
-
由 Junio C Hamano 提交于
* wk/doc-git-has-grown: user-manual: Update download size for Git and the kernel
-
由 Junio C Hamano 提交于
* ys/cygstart: web--browse: support /usr/bin/cygstart on Cygwin
-
由 Junio C Hamano 提交于
* mm/push-force-is-dangerous: Documentation/git-push.txt: explain better cases where --force is dangerous
-
由 Junio C Hamano 提交于
* rs/logical-vs-binary-or: use logical OR (||) instead of binary OR (|) in logical context
-
由 Junio C Hamano 提交于
* js/test-ln-s-add: t4011: remove SYMLINKS prerequisite t6035: use test_ln_s_add to remove SYMLINKS prerequisite t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite t3100: use test_ln_s_add to remove SYMLINKS prerequisite t3030: use test_ln_s_add to remove SYMLINKS prerequisite t0000: use test_ln_s_add to remove SYMLINKS prerequisite tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) tests: introduce test_ln_s_add t3010: modernize style test-chmtime: Fix exit code on Windows
-
由 Junio C Hamano 提交于
Allow our tests to run with newer Apache. * jk/apache-test-for-2.4: lib-httpd/apache.conf: check version only after mod_version loads t/lib-httpd/apache.conf: configure an MPM module for apache 2.4 t/lib-httpd/apache.conf: load compat access module in apache 2.4 t/lib-httpd/apache.conf: load extra auth modules in apache 2.4 t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4
-
由 Junio C Hamano 提交于
* tr/test-commit-only-on-orphan: Test 'commit --only' after 'checkout --orphan'
-
由 Junio C Hamano 提交于
* sb/archive-zip-double-assignment-fix: archive-zip:write_zip_entry: Remove second reset of size variable to zero.
-
由 Junio C Hamano 提交于
The bisect log listed incorrect commits when bisection ends with only skipped ones. * th/bisect-skip-report-range-fix: bisect: Fix log output for multi-parent skip ranges
-
由 Junio C Hamano 提交于
* rs/tar-tests: t5000: test long filenames t5000: simplify tar-tree tests t5000: use check_tar for prefix test t5000: factor out check_tar t5000, t5003: create directories for extracted files lazily t5000: integrate export-subst tests into regular tests
-
由 Junio C Hamano 提交于
* rr/column-doc: column doc: rewrite documentation for column.ui
-
由 Junio C Hamano 提交于
* rs/discard-index-discard-array: read-cache: free cache in discard_index read-cache: add simple performance test
-
由 Junio C Hamano 提交于
The test coverage framework was left broken for some time. * tr/coverage: coverage: build coverage-untested-functions by default coverage: set DEFAULT_TEST_TARGET to avoid using prove coverage: do not delete .gcno files before building coverage: split build target into compile and test
-
由 Stefan Beller 提交于
Reported-By: NIbrahim M. Ghazal <imgx64@gmail.com> Signed-off-by: NStefan Beller <stefanbeller@googlemail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 16 7月, 2013 7 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
"git apply" parsed patches that add new files, generated by programs other than Git, incorrectly. This is an old breakage in v1.7.11. * tr/maint-apply-non-git-patch-parsefix: apply: carefully strdup a possibly-NULL name
-
由 Junio C Hamano 提交于
Older cURL wanted piece of memory we call it with to be stable, but we updated the auth material after handing it to a call. * bc/http-keep-memory-given-to-curl: http.c: don't rewrite the user:passwd string multiple times
-
由 Junio C Hamano 提交于
"git pull" into nothing trashed "local changes" that were in the index. * jk/pull-into-dirty-unborn: pull: merge into unborn by fast-forwarding from empty tree pull: update unborn branch tip after index
-
由 Junio C Hamano 提交于
Many "git submodule" operations did not work on a submodule at a path whose name is not in ASCII. * fg/submodule-non-ascii-path: t7400: test of UTF-8 submodule names pass under Mac OS handle multibyte characters in name
-
由 Junio C Hamano 提交于
"cherry-pick" had a small leak in its error codepath. * fc/sequencer-plug-leak: sequencer: avoid leaking message buffer when refusing to create an empty commit sequencer: remove useless indentation
-
由 Junio C Hamano 提交于
Logic used by git-send-email to suppress cc mishandled names like "A U. Thor" <author@example.xz>, where the human readable part needs to be quoted (the user input may not have the double quotes around the name, and comparison was done between quoted and unquoted strings). It also mishandled names that need RFC2047 quoting. * mt/send-email-cc-match-fix: send-email: sanitize author when writing From line send-email: add test for duplicate utf8 name test-send-email: test for pre-sanitized self name t/send-email: test suppress-cc=self with non-ascii t/send-email: add test with quoted sender send-email: make --suppress-cc=self sanitize input t/send-email: test suppress-cc=self on cccmd send-email: fix suppress-cc=self on cccmd t/send-email.sh: add test for suppress-cc=self
-
- 09 7月, 2013 2 次提交
-
-
由 Thomas Rast 提交于
Some shells do not understand the one-line construct, and instead need FOO=bar && export FOO Detect this in the test-lint target. Signed-off-by: NThomas Rast <trast@inf.ethz.ch> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Thomas Rast 提交于
The == operator as an alias to = is not POSIX. This doesn't actually matter for the execution of the script, because it only runs when the shell is bash. However, it trips up test-lint, so it's nicer to use the standard form. Signed-off-by: NThomas Rast <trast@inf.ethz.ch> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 08 7月, 2013 2 次提交
-
-
由 Ramkumar Ramachandra 提交于
Signed-off-by: NRamkumar Ramachandra <artagnon@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Michael Haggerty 提交于
The path of the file to be locked is held in lock_file::filename, which is a fixed-length buffer of length PATH_MAX. This buffer is also (temporarily) used to hold the path of the lock file, which is the path of the file being locked plus ".lock". Because of this, the path of the file being locked must be less than (PATH_MAX - 5) characters long (5 chars are needed for ".lock" and one character for the NUL terminator). On entry into lock_file(), the path length was only verified to be less than PATH_MAX characters, not less than (PATH_MAX - 5) characters. When and if resolve_symlink() is called, then that function is correctly told to treat the buffer as (PATH_MAX - 5) characters long. This part is correct. However: * If LOCK_NODEREF was specified, then resolve_symlink() is never called. * If resolve_symlink() is called but the path is not a symlink, then the length check is never applied. So it is possible for a path with length (PATH_MAX - 5 <= len < PATH_MAX) to make it through the checks. When ".lock" is strcat()ted to such a path, the lock_file::filename buffer is overflowed. Fix the problem by adding a check when entering lock_file() that the original path is less than (PATH_MAX - 5) characters. [jc: with independent development by Peff] Signed-off-by: NMichael Haggerty <mhagger@alum.mit.edu> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 06 7月, 2013 1 次提交
-
-
由 Fraser Tweedale 提交于
The default similarity index of 50% is documented in gitdiffcore(7) but it is worth also mentioning it in the description of the -M/--find-renames option. Signed-off-by: NFraser Tweedale <frase@frase.id.au> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-