summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* git-svn: migrate out of contribEric Wong2006-07-0614-61/+28
| | | | | | | | | Allow NO_SVN_TESTS to be defined to skip git-svn tests. These tests are time-consuming due to SVN being slow, and even more so if SVN Perl libraries are not available. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'ew/instaweb'Junio C Hamano2006-07-064-1/+335
|\ | | | | | | | | | | | | | | | | | | * ew/instaweb: instaweb: fix unportable ';' usage in sed Makefile: replace ugly and unportable sed invocation Add git-instaweb, instantly browse the working repo with gitweb gitweb: Declare global variables with "our" gitweb: Enable tree (directory) history display gitweb: optimize per-file history generation
| * instaweb: fix unportable ';' usage in sedEric Wong2006-07-021-3/+3
| | | | | | | | | | | | | | | | | | Hint taken from Johannes. I've tested this with sed --posix on my system with GNU sed and it works fine with and also without it. Further portability testing/review would be good. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Makefile: replace ugly and unportable sed invocationJohannes Schindelin2006-07-021-5/+5
| | | | | | | | | | Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Add git-instaweb, instantly browse the working repo with gitwebEric Wong2006-07-014-1/+335
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I got tired of having to configure gitweb for every repository I work on. I sometimes prefer gitweb to standard GUIs like gitk or gitview; so this lets me automatically configure gitweb to browse my working repository and also opens my browser to it. Updates from the original patch: Added Apache/mod_perl2 compatibility if Dennis Stosberg's gitweb has been applied, too: <20060621130708.Gcbc6e5c@leonov.stosberg.net> General cleanups in shell code usage. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * gitweb: Declare global variables with "our"Dennis Stosberg2006-07-011-28/+27
| | | | | | | | | | | | | | Variables declared with "my" in the file scope cannot be accessed from subroutines with mod_perl. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * gitweb: Enable tree (directory) history displayLuben Tuikov2006-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | This patch allows history display of whole trees/directories a la "git-rev-list HEAD -- <dir or file>". I find this useful especially when a project lives in its own subdirectory, as opposed to being all of the GIT repository (i.e. when a sub-project is merged into a super-project). Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * gitweb: optimize per-file history generationJunio C Hamano2006-07-011-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | The rev-list command that is recent enough can filter commits based on paths they touch, so use it instead of generating the full list and limiting it by passing it with diff-tree --stdin. [jc: The patch originally came from Luben Tuikov but the it was corrupt, but it was short enough to be applied by hand. I added the --full-history to make the output compatible with the original while doing so.] Signed-off-by: Junio C Hamano <junkio@cox.net>
* | core.compression documentation formatting fix.Joachim Berdal Haga2006-07-061-1/+1
| | | | | | | | | | | | | | I didn't notice earlier that two colons are required for the asciidoc entry. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-reset: complain and exit upon seeing an unknown parameter.Junio C Hamano2006-07-051-1/+5
| | | | | | | | | | | | | | | | The check to use "rev-parse --verify" was defeated by the use of "--default HEAD". "git reset --hard bogus-committish" just defaulted to reset to the HEAD without complaining. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'lt/gitweb'Junio C Hamano2006-07-051-35/+31
|\ \ | | | | | | | | | | | | | | | | | | * lt/gitweb: gitweb: Declare global variables with "our" gitweb: Enable tree (directory) history display gitweb: optimize per-file history generation
| * | gitweb: Declare global variables with "our"Dennis Stosberg2006-07-011-28/+27
| | | | | | | | | | | | | | | | | | | | | Variables declared with "my" in the file scope cannot be accessed from subroutines with mod_perl. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | gitweb: Enable tree (directory) history displayLuben Tuikov2006-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch allows history display of whole trees/directories a la "git-rev-list HEAD -- <dir or file>". I find this useful especially when a project lives in its own subdirectory, as opposed to being all of the GIT repository (i.e. when a sub-project is merged into a super-project). Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | gitweb: optimize per-file history generationJunio C Hamano2006-07-011-7/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | The rev-list command that is recent enough can filter commits based on paths they touch, so use it instead of generating the full list and limiting it by passing it with diff-tree --stdin. [jc: The patch originally came from Luben Tuikov but the it was corrupt, but it was short enough to be applied by hand. I added the --full-history to make the output compatible with the original while doing so.] Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'jc/fmt-merge-msg-test'Junio C Hamano2006-07-051-0/+163
|\ \ | | | | | | | | | | | | * jc/fmt-merge-msg-test: t6200: fmt-merge-msg test.
| * | t6200: fmt-merge-msg test.Junio C Hamano2006-07-031-0/+163
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'jc/sha1'Junio C Hamano2006-07-054-156/+331
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * jc/sha1: A better-scheduled PPC SHA-1 implementation. test-sha1: test hashing large buffer Makefile: add framework to verify and bench sha1 implementations.
| * | | A better-scheduled PPC SHA-1 implementation.Unknown2006-06-241-156/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is about 15% faster that the current sha1ppc.S on a G4, and 5% faster on a G5 when hashing 10 million bytes, unaligned. (The G5 ratio seems to get better as the sizes fall.) It's also somewhat smaller, due to using load-multiple instructions. No copyright is claimed on the changes to Paul Mackerras' work below.
| * | | test-sha1: test hashing large bufferJunio C Hamano2006-06-242-9/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | test to hash a large buffer in one go is more important than hashing large amount of data in small fixed chunks. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | Makefile: add framework to verify and bench sha1 implementations.Junio C Hamano2006-06-243-0/+113
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Merge branch 'jc/diff-test'Junio C Hamano2006-07-0510-0/+263
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * jc/diff-test: t4013: add "diff" UI program tests.
| * | | | t4013: add "diff" UI program tests.Junio C Hamano2006-07-0110-0/+263
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | | Merge branch 'th/diff'Junio C Hamano2006-07-05110-205/+4722
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * th/diff: builtin-diff: turn recursive on when defaulting to --patch format. t4013: note improvements brought by the new output code. t4013: add format-patch tests. format-patch: fix diff format option implementation combine-diff.c: type sanity. t4013 test updates for new output code. Fix some more diff options changes. Fix diff-tree -s log --raw: Don't descend into subdirectories by default diff-tree: Use ---\n as a message separator Print empty line between raw, stat, summary and patch t4013: add more tests around -c and --cc whatchanged: Default to DIFF_FORMAT_RAW Don't xcalloc() struct diffstat_t Add msg_sep to diff_options DIFF_FORMAT_RAW is not default anymore Set default diff output format after parsing command line Make --raw option available for all diff commands Merge with_raw, with_stat and summary variables to output_format t4013: add tests for diff/log family output options.
| * | | | | builtin-diff: turn recursive on when defaulting to --patch format.Junio C Hamano2006-07-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | | Merge branch 'jc/diff-test-updates' into th/diffJunio C Hamano2006-06-294-6/+68
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jc/diff-test-updates: t4013: note improvements brought by the new output code.
| | * | | | | t4013: note improvements brought by the new output code.Junio C Hamano2006-06-294-6/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * | | | | Merge branch 'jc/diff-test' into jc/diff-test-updatesJunio C Hamano2006-06-297-1/+581
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * jc/diff-test: t4013: add format-patch tests.
| * | | | | | Merge branch 'jc/diff-test' into th/diffJunio C Hamano2006-06-297-1/+581
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * jc/diff-test: t4013: add format-patch tests.
| | * | | | | t4013: add format-patch tests.Junio C Hamano2006-06-297-1/+581
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | | | format-patch: fix diff format option implementationJunio C Hamano2006-06-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The updates forgot to make the diff go recursive.
| * | | | | | Merge branch 'jc/diff-test-updates' into th/diffJunio C Hamano2006-06-286-10/+4
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * jc/diff-test-updates: t4013 test updates for new output code.
| | * | | | | t4013 test updates for new output code.Junio C Hamano2006-06-276-10/+4
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are updates to the test vector that shows the "incompatibility" of the new output code. The changes are actually the good ones, so instead of keeping the older output we adjust the test to the new code. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | | combine-diff.c: type sanity.Junio C Hamano2006-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In diff_tree_combined(), show_log_first boolean is initialized with rev->loginfo (pointer to a string); the intention is that if we have some string to be emitted we would want to remember that fact. Picky compilers are offended by this, so make the expression a bit type-safer. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | | Fix some more diff options changes.Junio C Hamano2006-06-274-19/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes various problems in the new diff options code. - Fix --cc/-c --patch; it showed two-tree diff used internally. - Use "---\n" only where it matters -- that is, use it immediately after the commit log text when we show a commit log and something else before the patch text. - Do not output spurious extra "\n"; have an extra newline after the commit log text always when we have diff output and we are not doing oneline. - When running a pickaxe you need to go recursive. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | | Merge branch 'jc/diff-test' into th/diffJunio C Hamano2006-06-2789-0/+3839
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * jc/diff-test: t4013: add more tests around -c and --cc t4013: add tests for diff/log family output options.
| | * | | | t4013: add more tests around -c and --ccJunio C Hamano2006-06-2618-3/+1263
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * | | | t4013: add tests for diff/log family output options.Junio C Hamano2006-06-2672-0/+2579
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | | Fix diff-tree -sTimo Hirvonen2006-06-271-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setup_revisions() calls diff_setup_done() before we can set default value for output_format. Don't convert DIFF_FORMAT_NO_OUTPUT to 0 in diff_setup_done(), it is useless and makes diff-tree believe no diff format parameters were given and thus lets it reset output_format to DIFF_FORMAT_RAW. Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | | log --raw: Don't descend into subdirectories by defaultTimo Hirvonen2006-06-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only do so when -r is given. Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | | diff-tree: Use ---\n as a message separatorTimo Hirvonen2006-06-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | | Print empty line between raw, stat, summary and patchTimo Hirvonen2006-06-271-5/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | | whatchanged: Default to DIFF_FORMAT_RAWTimo Hirvonen2006-06-261-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split cmd_log_wc() to cmd_log_init() and cmd_log_walk() and set default diff output format for whatchanged to DIFF_FORMAT_RAW. Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | | Don't xcalloc() struct diffstat_tTimo Hirvonen2006-06-261-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | | Add msg_sep to diff_optionsTimo Hirvonen2006-06-266-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add msg_sep variable to struct diff_options. msg_sep is printed after commit message. Default is "\n", format-patch sets it to "---\n". This also removes the second argument from show_log() because all callers derived it from the first argument: show_log(rev, rev->loginfo, ... Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | | DIFF_FORMAT_RAW is not default anymoreTimo Hirvonen2006-06-262-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | diff_setup() used to initialize output_format to DIFF_FORMAT_RAW. Now the default is 0 (no output) so don't compare against DIFF_FORMAT_RAW to see if any diff format command line flags were given. Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | | Set default diff output format after parsing command lineTimo Hirvonen2006-06-267-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize output_format to 0 instead of DIFF_FORMAT_RAW so that we can see later if any command line options changed it. Default value is set only if output format was not specified. Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | | Make --raw option available for all diff commandsTimo Hirvonen2006-06-262-36/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | | Merge with_raw, with_stat and summary variables to output_formatTimo Hirvonen2006-06-266-144/+136
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DIFF_FORMAT_* are now bit-flags instead of enumerated values. Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | | Merge branch 'jc/grepfix'Junio C Hamano2006-07-051-10/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jc/grepfix: git-grep: use a bit more specific error messages. git-grep: fix exit code when we use external grep. git-grep: fix parsing of pathspec separator '--'
| * | | | | git-grep: use a bit more specific error messages.Junio C Hamano2006-07-041-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
View Lorry Controller Status