summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * | git-grep: fix exit code when we use external grep.Junio C Hamano2006-07-041-5/+10
| | | | | | | | | | | | | | | | | | Upon hit, we should exit with status 0. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | git-grep: fix parsing of pathspec separator '--'Junio C Hamano2006-07-041-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | We used to misparse git grep -e foo -- '*.sh' Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'js/fmt-merge-msg'Junio C Hamano2006-07-055-177/+362
|\ \ \ | | | | | | | | | | | | | | | | * js/fmt-merge-msg: Make git-fmt-merge-msg a builtin
| * | | Make git-fmt-merge-msg a builtinJohannes Schindelin2006-07-035-177/+362
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Fix print-log and diff compatibility with recent vc versionsVille Skytt,Ad(B2006-07-051-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Here's a patch that fixes print-log and diff compatibility with recent vc versions, such as current GNU Emacs CVS. Signed-off-by: Ville Skytt,Ad(B <scop@xemacs.org>
* | | | git-svn: avoid fetching files outside of the URL we're trackingEric Wong2006-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Santi <sbejar@gmail.com> for the bug report and explanation: > /path/to/repository/project/file > /path/to/repository/project-2/file <...> > you end up with a project with the following files: > > file > -2/file Signed-off-by: Eric Wong <normalperson@yhbt.net>
* | | | Improve git-peek-remoteLinus Torvalds2006-07-044-13/+58
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes git-peek-remote able to basically do everything that git-ls-remote does (but obviously just for the native protocol, so no http[s]: or rsync: support). The default behaviour is the same, but you can now give a mixture of "--refs", "--tags" and "--heads" flags, where "--refs" forces git-peek-remote to only show real refs (ie none of the fakey tag lookups, but also not the special pseudo-refs like HEAD and MERGE_HEAD). The "--tags" and "--heads" flags respectively limit the output to just regular tags and heads, of course. You can still also ask to limit them by name too. You can combine the flags, so git peek-remote --refs --tags . will show all local _true_ tags, without the generated tag lookups (compare the output without the "--refs" flag). And "--tags --heads" will show both tags and heads, but will avoid (for example) any special refs outside of the standard locations. I'm also planning on adding a "--ignore-local" flag that allows us to ask it to ignore any refs that we already have in the local tree, but that's an independent thing. All this is obviously gearing up to making "git fetch" cheaper. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | t8001-annotate: fix a bash-ism in this testEric Wong2006-07-041-2/+2
|/ / | | | | | | | | Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | send-email: do not barf when Term::ReadLine does not like your terminalJunio C Hamano2006-07-032-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | As long as we do not need to readline from the terminal, we should not barf when starting up the program. Without this patch, t9001 test on Cygwin occasionally died with the following error message: Unable to get Terminal Size. The TIOCGWINSZ ioctl didn't work. The COLUMNS and LINES environment variables didn't work. The resize program didn't work. at /usr/lib/perl5/vendor_perl/5.8/cygwin/Term/ReadKey.pm line 362. Compilation failed in require at /usr/lib/perl5/vendor_perl/5.8/Term/ReadLine/Perl.pm line 58. Acked-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | boolean: accept yes and no as wellJunio C Hamano2006-07-031-2/+2
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | annotate: Correct most merge following to annotate correctly.Ryan Anderson2006-07-031-58/+139
| | | | | | | | | | | | | | | | There is still a bug involving octopus merges, somewhere, but this gets normal merges correct, so it's still an improvement over the existing version. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | annotate: Support annotation of files on other revisions.Ryan Anderson2006-07-031-0/+6
| | | | | | | | | | | | | | | | | | | | | | This is a bug fix, and cleans up one or two other things spotted during the course of tracking down the main bug here. Also, the test-suite is updated to reflect this case. Signed-off-by: Ryan Anderson <ryan@michonline.com> (cherry picked from 2f7554b4db3ab2c2d3866b160245c91c9236fc9a commit) Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Make zlib compression level configurable, and change default.Joachim B Haga2006-07-038-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the change in default, "git add ." on kernel dir is about twice as fast as before, with only minimal (0.5%) change in object size. The speed difference is even more noticeable when committing large files, which is now up to 8 times faster. The configurability is through setting core.compression = [-1..9] which maps to the zlib constants; -1 is the default, 0 is no compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. Signed-off-by: Joachim B Haga (cjhaga@fys.uio.no) Acked-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Makefile: tighten git-http-{fetch,push} dependenciesJunio C Hamano2006-07-031-2/+2
| | | | | | | | | | | | | | | | | | | | Although our "git-%$X:" implicit target had dependency on $(GITLIBS) which included xdiff/lib.a, git-http-{fetch,push} had their own building rules and with an obsolete dependency on $(LIB_FILES). Update the rules to depend on $(GITLIBS), to make parallel build work correctly. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Empty author may be presented by svn as an empty string or a null value.Robin Rosenberg2006-07-021-1/+1
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | revision.c: fix "dense" under --remove-emptyLinus Torvalds2006-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | It had the wrong test for whether a commit was a merge. What it did was to say that a non-merge has exactly one parent (which sounds almost right), but the fact is, initial trees have no parent at all, but they're obviously not merges. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git object hash cleanupsv1.4.1Linus Torvalds2006-07-011-44/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This IMNSHO cleans up the object hashing. The hash expansion is separated out into a function of its own, the hash array (and size) names are made more obvious, and the code is generally made to look a bit more like the object-ref hashing. It also gets rid of "find_object()" returning an index (or negative position if no object is found), since that is made redundant by the simplified object rehashing. The basic operation is now "lookup_object()" which just returns the object itself. There's an almost unmeasurable speed increase, but more importantly, I think the end result is more readable. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | revision.c: --full-history fix.Linus Torvalds2006-07-011-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With history simplification, we still show merges that are required to make the history _complete_, i.e. say that you had: a | b / \ c d | | and neither "a" nor "b" actually changed the file, but both "c" and "d" did: in this case we have to leave "b" around just because otherwise there would be no way to show the _relationship_, even if "b" itself doesn't actually change the tree in any way what-so-ever. It would make sense to make that further simplification if the "--parents" flag wasn't present. In that case the user is literally asking for a list of commits and is not interested in the relationship between them. This patch also fixes a real bug. Without this patch, the "--parents --full-history" combination (which you'd get if you do something like gitk --full-history Makefile or similar) will actually _drop_ merges where all children are identical. That's wrong in the --full-history case, because it means that the graph ends up missing lots of entries. In the process, this also should make git-rev-list --full-history Makefile give just the _true_ list of all commits that changed Makefile (and properly ignore merges that were identical in one parent), because now we're not asking for "--parent", so we don't need the unnecessary merge commits to keep the history together. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix errno usage in connect.cPetr Baudis2006-07-011-6/+12
| | | | | | | | | | | | | | | | errno was used after it could've been modified by a subsequent library call. Spotted by Morten Welinder. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Minor documentation fixup.Robin Rosenberg2006-07-011-3/+3
| | | | | | | | | | Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
View Lorry Controller Status