- 30 6月, 2011 19 次提交
-
-
由 Junio C Hamano 提交于
* jn/gitweb-js-blame: gitweb.js: use setTimeout rather than setInterval in blame_incremental.js gitweb.js: No need for loop in blame_incremental's handleResponse() gitweb.js: No need for inProgress in blame_incremental.js
-
由 Junio C Hamano 提交于
* da/git-prefix-everywhere: t/t7503-pre-commit-hook.sh: Add GIT_PREFIX tests git-mergetool--lib: Make vimdiff retain the current directory git: Remove handling for GIT_PREFIX setup: Provide GIT_PREFIX to built-ins
-
由 Junio C Hamano 提交于
* jc/streaming: sha1_file: use the correct type (ssize_t, not size_t) for read-style function streaming: read loose objects incrementally sha1_file.c: expose helpers to read loose objects streaming: read non-delta incrementally from a pack streaming_write_entry(): support files with holes convert: CRLF_INPUT is a no-op in the output codepath streaming_write_entry(): use streaming API in write_entry() streaming: a new API to read from the object store write_entry(): separate two helper functions out unpack_object_header(): make it public sha1_object_info_extended(): hint about objects in delta-base cache sha1_object_info_extended(): expose a bit more info packed_object_info_detail(): do not return a string
-
由 Junio C Hamano 提交于
* ab/i18n-scripts: (48 commits) i18n: git-bisect bisect_next_check "You need to" message i18n: git-bisect [Y/n] messages i18n: git-bisect bisect_replay + $1 messages i18n: git-bisect bisect_reset + $1 messages i18n: git-bisect bisect_run + $@ messages i18n: git-bisect die + eval_gettext messages i18n: git-bisect die + gettext messages i18n: git-bisect echo + eval_gettext message i18n: git-bisect echo + gettext messages i18n: git-bisect gettext + echo message i18n: git-bisect add git-sh-i18n i18n: git-stash drop_stash say/die messages i18n: git-stash "unknown option" message i18n: git-stash die + eval_gettext $1 messages i18n: git-stash die + eval_gettext $* messages i18n: git-stash die + eval_gettext messages i18n: git-stash die + gettext messages i18n: git-stash say + gettext messages i18n: git-stash echo + gettext message i18n: git-stash add git-sh-i18n ...
-
由 Junio C Hamano 提交于
* ef/maint-win-verify-path: verify_dotfile(): do not assume '/' is the path seperator verify_path(): simplify check at the directory boundary verify_path: consider dos drive prefix real_path: do not assume '/' is the path seperator A Windows path starting with a backslash is absolute
-
由 Junio C Hamano 提交于
* js/i18n-windows: Windows: teach getenv to do a case-sensitive search mingw.c: move definition of mingw_getenv down sh-i18n--envsubst: do not crash when no arguments are given
-
由 Junio C Hamano 提交于
* rs/grep-color: grep: add --heading grep: add --break grep: fix coloring of hunk marks between files
-
由 Junio C Hamano 提交于
* jc/maint-1.7.3-checkout-describe: checkout -b <name>: correctly detect existing branch
-
由 Junio C Hamano 提交于
* db/http-cookies: http: pass http.cookiefile using CURLOPT_COOKIEFILE
-
由 Junio C Hamano 提交于
* jk/maint-1.7.2-status-ignored: git status --ignored: tests and docs status: fix bug with missing --ignore files Conflicts: Documentation/git-status.txt t/t7508-status.sh
-
由 Junio C Hamano 提交于
* jc/diff-index-quick-exit-early: diff-index --quiet: learn the "stop feeding the backend early" logic Conflicts: unpack-trees.h
-
由 Junio C Hamano 提交于
* mg/diff-stat-count: diff --stat-count: finishing touches diff-options.txt: describe --stat-{width,name-width,count} diff: introduce --stat-lines to limit the stat lines diff.c: omit hidden entries from namelen calculation with --stat
-
由 Junio C Hamano 提交于
* jc/advice-about-to-lose-commit: checkout: make advice when reattaching the HEAD less loud Conflicts: builtin/checkout.c
-
由 Junio C Hamano 提交于
* jk/combine-diff-binary-etc: combine-diff: respect textconv attributes refactor get_textconv to not require diff_filespec combine-diff: handle binary files as binary combine-diff: calculate mode_differs earlier combine-diff: split header printing into its own function
-
git://bogomips.org/git-svn由 Junio C Hamano 提交于
* 'instaweb' of git://bogomips.org/git-svn: git-instaweb: Check that correct config file exists for (re)start git-instaweb: Move all actions at the end of script git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.conf git-instaweb: Extract configuring web server into configure_httpd
-
git://bogomips.org/git-svn由 Junio C Hamano 提交于
* git://bogomips.org/git-svn: git-svn: Correctly handle root commits in mergeinfo ranges git-svn: Disambiguate rev-list arguments to improve error message git-svn: Demonstrate a bug with root commits in mergeinfo ranges
-
由 Junio C Hamano 提交于
* maint-1.7.5: test: skip clean-up when running under --immediate mode "branch -d" can remove more than one branches
-
由 Junio C Hamano 提交于
Some tests try to be too careful about cleaning themselves up and do test_expect_success description ' set-up some test refs and/or configuration && test_when_finished "revert the above changes" && the real test ' Which is nice to make sure that a potential failure would not have unexpected interaction with the next test. This however interferes when "the real test" fails and we want to see what is going on, by running the test with --immediate mode and descending into its trash directory after the test stops. The precondition to run the real test and cause it to fail is all gone after the clean-up procedure defined by test_when_finished is done. Update test_run_ which is the workhorse of running a test script called from test_expect_success and test_expect_failure, so that we do not run clean-up script defined with test_when_finished when a test that is expected to succeed fails under the --immediate mode. Signed-off-by: NJunio C Hamano <gitster@pobox.com> Acked-by: NJeff King <peff@peff.net>
-
由 Junio C Hamano 提交于
Since 03feddd6 (git-check-ref-format: reject funny ref names, 2005-10-13), "git branch -d" can take more than one branch names to remove. The documentation was correct, but the usage string was not. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 28 6月, 2011 3 次提交
-
-
由 Michael Haggerty 提交于
If the bottom of a mergeinfo range is a commit that maps to a git root commit, then it doesn't have a parent. In such a case, use git commit range "$top_commit" rather than "$bottom_commit^..$top_commit". [ew: line-wrap at 80 columns] Signed-off-by: NMichael Haggerty <mhagger@alum.mit.edu> Acked-by: NEric Wong <normalperson@yhbt.net>
-
由 Michael Haggerty 提交于
Add "--" in the "git rev-list" command line so that if there is a bug and the revisions cannot be found, the error message is a bit less cryptic. Signed-off-by: NMichael Haggerty <mhagger@alum.mit.edu> Acked-by: NEric Wong <normalperson@yhbt.net>
-
由 Michael Haggerty 提交于
If a svn:mergeinfo range starts at a commit that was converted as a git root commit (e.g., r1 or a branch that was created out of thin air), then there is an error when git-svn tries to run git rev-list "$bottom_commit^..$top_commit" because $bottom_commit (the git commit corresponding to r1) has no parent. Signed-off-by: NMichael Haggerty <mhagger@alum.mit.edu> Acked-by: NEric Wong <normalperson@yhbt.net>
-
- 27 6月, 2011 6 次提交
-
-
由 Jakub Narebski 提交于
Currently start/restart does not generate any configuration files for spawning a new instance. This means that $ git instaweb --http=<server> --start might pick up stale 'httpd.conf' file for a different web server (e.g. for default lighttpd when requesting apache2). This commit changes that, and makes git-instaweb generate web server config file and/or gitweb config file if don't exists. This required naming config files after the name of web server (alternate solution would be to somehow mark for which web server was config file generated). Note that web servers that embed configuration in server script file, namely webrick and plackup, and which delete "$conf" in their *_conf function, would have their config (server script) always regenerated. Note: this commit introduces a bit of code repetition (but only a few lines). Reported-by: NGurjeet Singh <singh.gurjeet@gmail.com> Signed-off-by: NJakub Narebski <jnareb@gmail.com> Acked-by: NEric Wong <normalperson@yhbt.net>
-
由 Jakub Narebski 提交于
As a nice side-effect now the order of parameters does not matter: $ git instaweb --httpd=apache2 --start is now (after this patch) the same as $ git instaweb --start --httpd=apache2 Before this commit --start, --stop, --restart (and their subcommand versions start, stop, restart) exited immediately. This is preparatory work for making start/restart check that correct configuration is set up; this change was required to have access in start_httpd to requested web browser etc. Signed-off-by: NJakub Narebski <jnareb@gmail.com> Acked-by: NEric Wong <normalperson@yhbt.net>
-
由 Jakub Narebski 提交于
Don't repeat yourself: use "$conf" instead of its [current] contents, namely "$fqgitdir/gitweb/httpd.conf". Signed-off-by: NJakub Narebski <jnareb@gmail.com> Acked-by: NEric Wong <normalperson@yhbt.net>
-
由 Jakub Narebski 提交于
This is preparatory work for making start/restart check that git-instaweb set up correct configuration, and generate it if it is missing. Pure refactoring, no functional changes. Signed-off-by: NJakub Narebski <jnareb@gmail.com> Acked-by: NEric Wong <normalperson@yhbt.net>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: completion: replace core.abbrevguard to core.abbrev
-
- 25 6月, 2011 2 次提交
-
-
由 Junio C Hamano 提交于
* maint-1.7.4: completion: replace core.abbrevguard to core.abbrev
-
由 Namhyung Kim 提交于
The core.abbrevguard config variable had removed and now core.abbrev has been used instead. Teach it. Signed-off-by: NNamhyung Kim <namhyung@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 23 6月, 2011 3 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: Documentation: git diff --check respects core.whitespace
-
由 Christof Krüger 提交于
Fix documentation on "git diff --check" by adopting the description from "git apply --whitespace". Signed-off-by: NChristof Krüger <git@christof-krueger.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 22 6月, 2011 2 次提交
-
-
由 Junio C Hamano 提交于
* maint: gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled
-
由 Jakub Narebski 提交于
Both 'pickaxe' (searching changes) and 'grep' (searching files) require basic 'search' feature to be enabled to work. Enabling e.g. only 'pickaxe' won't work. Add a comment about this. Signed-off-by: NJakub Narebski <jnareb@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 21 6月, 2011 3 次提交
-
-
由 Junio C Hamano 提交于
* mk/grep-pcre: t7810: avoid unportable use of "echo"
-
由 Junio C Hamano 提交于
Michael J Gruber noticed that under /bin/dash this test failed (as is expected -- \n in the string can be interpreted by the command), while it passed with bash. We probably could work it around by using backquote in front of it, but it is safer and more readable to avoid "echo" altogether in a case like this. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jim Meyering 提交于
Signed-off-by: NJim Meyering <meyering@redhat.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 20 6月, 2011 2 次提交
-
-
由 Junio C Hamano 提交于
* di/no-no-existant: Fix typo: existant->existent
-
由 Junio C Hamano 提交于
* maint: builtin/gc.c: add missing newline in message
-