AgeCommit message (Collapse)Author
2007-12-16whitespace: reorganize initial-indent checkJ. Bruce Fields
Reorganize to emphasize the most complicated part of the code (the tab case). Signed-off-by: J. Bruce Fields <> Signed-off-by: Junio C Hamano <>
2007-12-16whitespace: fix off-by-one error in non-space-in-indent checkingJ. Bruce Fields
If there were no tabs, and the last space was at position 7, then positions 0..7 had spaces, so there were 8 spaces. Update test to check exactly this case. Signed-off-by: J. Bruce Fields <> Signed-off-by: Junio C Hamano <>
2007-12-16rename git-browse--help to git-help--browseJeff King
The convention for helper scripts has been git-$TOOL--$HELPER. Since this is a "browse" helper for the "help" tool, git-help--browse is a more sensible name. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
2007-12-16Fix a memory leak李鸿
Signed-off-by: Li Hong <> Signed-off-by: Junio C Hamano <>
2007-12-16gitweb: Make config_to_multi return [] instead of [undef]Petr Baudis
This is important for the list of clone urls, where if there are no per-repository clone URL configured, the default base URLs are never used for URL construction without this patch. Add tests for different ways of setting project URLs, just in case. Note that those tests in current form wouldn't detect breakage fixed by this patch, as it only checks for errors and not for expected output. Signed-off-by: Petr Baudis <> Signed-off-by: Jakub Narebski <> Signed-off-by: Junio C Hamano <>
2007-12-16gitweb: Teach "a=blob" action to be more lenient about blob/file mime typeJakub Narebski
Since 930cf7dd7cc6b87d173f182230763e1f1913d319 'blob' action knows the file type; if the file type is not "text/*" or one of common network image formats/mimetypes (gif, png, jpeg) then the action "blob" defaulted to "blob_plain". This caused the problem if mimetypes file was not well suited for web, for example returning "application/x-sh" for "*.sh" shell scripts, instead of "text/plain" (or other "text/*"). Now "blob" action defaults to "blob_plain" ('raw' view) only if file is of type which is neither "text/*" nor "image/{gif,png,jpeg}" AND it is binary file. Otherwise it assumes that it can be displayed either in <img> tag ("image/*" mimetype), or can be displayed line by line (otherwise). Signed-off-by: Jakub Narebski <> Signed-off-by: Junio C Hamano <>
2007-12-16gitweb: disambiguate heads and tags withs the same nameJakub Narebski
Avoid wrong disambiguation that would link logs/trees of tags and heads which share the same name to the same page, leading to a disambiguation that would prefer the tag, thus making it impossible to access the corresponding head log and tree without hacking the url by hand. It does it by using full refname (with 'refs/heads/' or 'refs/tags/' prefix) instead of shortened one in the URLs in 'heads' and 'tags' tables. This makes URLs (and refs) provided by gitweb unambiguous. Signed-off-by: Guillaume Seguin <> Signed-off-by: Jakub Narebski <> Signed-off-by: Junio C Hamano <>
2007-12-16teach bash completion to treat commands with "--" as a helperJeff King
There is a convention that commands containing a double-dash are implementation details and not to be used by mortals. We should automatically remove them from the completion suggestions as such. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
2007-12-16trim_common_tail: brown paper bag fix.Jeff King
The recovered context lines were not LF terminated due to off-by-one error, which also caused the outer loop to count the number of recovered lines to terminate after running only once. Signed-off-by: Junio C Hamano <>
2007-12-15Update draft release notes for 1.5.4Junio C Hamano
Signed-off-by: Junio C Hamano <>
2007-12-15Start preparing the API documents.Junio C Hamano
Most of them are still stubs, but the procedure to build the HTML documentation, maintaining the index and installing the end product are there. I placed names of people who are likely to know the most about the topic in the stub files, so that volunteers will know whom to ask questions as needed. Signed-off-by: Junio C Hamano <>
2007-12-15Retire git-runstatus for real.Junio C Hamano
The command was removed from the builtin command list and there was no way to invoke it, but the code was still there. Signed-off-by: Junio C Hamano <>
2007-12-15Rename git-browse-help helper to git-browse--helpJunio C Hamano
Signed-off-by: Junio C Hamano <>
2007-12-15git-help: add "help.format" config variable.Christian Couder
This config variable makes it possible to choose the default format used to display help. This format will be used only if no option like -a|--all|-i|--info|-m|--man|-w|--web is passed to "git-help". The following values are possible for this variable: - "man" --> "man" program is used - "info" --> "info" program is used - "web" --> "git-browse-help" is used By default we still show help using "man". This patch also adds -m|--man command line option to use "man" to allow overriding the "help.format" configuration variable. Note that this patch also revert some recent changes in "git-browse-help" because they prevented to look for config variables in the global configuration file. Signed-off-by: Christian Couder <> Signed-off-by: Junio C Hamano <>
2007-12-15Merge branch 'wc/diff'Junio C Hamano
* wc/diff: Test interaction between diff --check and --exit-code Use shorter error messages for whitespace problems Add tests for "git diff --check" with core.whitespace options Make "diff --check" output match "git apply" Unify whitespace checking diff --check: minor fixups "diff --check" should affect exit status
2007-12-15Move fetch_ref from http-push.c and http-walker.c to http.cMike Hommey
Make the necessary changes to be ok with their difference, and rename the function http_fetch_ref. Signed-off-by: Mike Hommey <> Signed-off-by: Junio C Hamano <>
2007-12-15Fix various memory leaks in http-push.c and http-walker.cMike Hommey
Signed-off-by: Mike Hommey <> Signed-off-by: Junio C Hamano <>
2007-12-15Use strbuf in http codeMike Hommey
Also, replace whitespaces with tabs in some places Signed-off-by: Mike Hommey <> Signed-off-by: Junio C Hamano <>
2007-12-15Avoid redundant declaration of missing_target()Mike Hommey
Signed-off-by: Mike Hommey <> Signed-off-by: Junio C Hamano <>
2007-12-15Remove a CURLOPT_HTTPHEADER (un)settingMike Hommey
Setting CURLOPT_HTTPHEADER doesn't add HTTP headers, but replaces whatever set of headers was configured before, so setting to NULL doesn't have any magic meaning, and is pretty much useless when setting to another list right after. Signed-off-by: Mike Hommey <> Signed-off-by: Junio C Hamano <>
2007-12-15Remove the default_headers variable from http-push.cMike Hommey
It appears that despite being initialized, it was never used. Signed-off-by: Mike Hommey <> Signed-off-by: Junio C Hamano <>
2007-12-15Fix random sha1 in error message in http-fetch and http-pushMike Hommey
When a downloaded ref doesn't contain a sha1, the error message displays a random sha1 because of uninitialized memory. This happens when cloning a repository that is already a clone of another one, in which case refs/remotes/origin/HEAD is a symref. Signed-off-by: Mike Hommey <> Signed-off-by: Junio C Hamano <>
2007-12-15Fix some more memory leaks in http-push.cMike Hommey
Signed-off-by: Mike Hommey <> Signed-off-by: Junio C Hamano <>
2007-12-15Test interaction between diff --check and --exit-codeWincent Colaiuta
Make sure that it works as advertised in the man page. Signed-off-by: Wincent Colaiuta <> Signed-off-by: Junio C Hamano <>
2007-12-15Use shorter error messages for whitespace problemsWincent Colaiuta
The initial version of the whitespace_error_string() function took the messages from builtin-apply.c rather than the shorter messages from diff.c. This commit addresses Junio's concern that these messages might be too long (now that we can emit multiple warnings per line). Signed-off-by: Wincent Colaiuta <> Signed-off-by: Junio C Hamano <>
2007-12-15Use a strbuf for building up section header and key/value pair strings.Kristian Høgsberg
Avoids horrible 1-byte write(2) calls and cleans up the logic a bit. Signed-off-by: Kristian Høgsberg <> Signed-off-by: Junio C Hamano <>
2007-12-15fast-import: fix unalinged allocation and accessDavid S. Miller
The specialized pool allocator fast-import uses aligned objects on the size of a pointer, which was not sufficient at least on Sparc. Instead, make the alignment for objects of type unitmax_t. Signed-off-by: David S. Miller <> Signed-off-by: Junio C Hamano <>
2007-12-15remote: Fix bogus make_branch() call in configuration reader.Junio C Hamano
The configuration reader to enumerate branches that have configuration data were not careful enough and failed to skip "branch.<variable>" entries (e.g. branch.autosetupmerge). This resulted in bogus attempt to allocate huge memory. Noticed by David Miller. Signed-off-by: Junio C Hamano <>
2007-12-14commit: allow --amend to reuse message from another commitJunio C Hamano
After tentatively applying a patch from a contributor, you can get a replacement patch with corrected code and unusable commit log message. In such a case, this sequence ought to give you an editor based on the message in the earlier commit, to let you describe an incremental improvement: git reset --hard HEAD^ ;# discard the earlier one git am <corrected-patch git commit --amend -c HEAD@{1} Unfortunately, --amend insisted reusing the message from the commit being amended, ignoring the -c option. This corrects it. Signed-off-by: Junio C Hamano <>
2007-12-14git-svn: handle our top-level path being deleted and later re-addedEric Wong
Previously, git-svn would ignore cases where the path we're tracking is removed from the repository. This was to prevent heads with follow-parent from ending up with a tree full of empty revisions (and thus breaking rename detection). The previous behavior is fine until the path we're tracking is re-added later on, leading to the old files being merged in with the new files in the directory (because the old files were never marked as deleted) We will now only remove all the old files locally that were deleted remotely iff we detect the directory we're in is being created from scratch. Thanks for Marcus D. Hanwell for the bug report and Peter Baumann for the analysis. Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2007-12-14cvsexportcommit: fix massive commitsJeff King
Because we feed the changed filenames to CVS on the command line, it was possible for massive commits to overflow the system exec limits. Instead, we now do an xargs-like split of the arguments. This means that we lose some of the atomicity of calling CVS in one shot. Since CVS commits are not atomic, but the CVS protocol is, the possible effects of this are not clear; however, since CVS doesn't provide a different interface, this is our only option for large commits (short of writing a CVS client library). The argument size limit is arbitrarily set to 64kB. This should be high enough to trigger only in rare cases where it is necessary, so normal-sized commits are not affected by the atomicity change. Signed-off-by: Junio C Hamano <>
2007-12-14Documentation: describe pack idx
Lifted from the log message of c553ca25bd60dc9fd50b8bc7bd329601b81cee66 (pack-objects: learn about pack index version 2). Acked-by: Nicolas Pitre <> Signed-off-by: Junio C Hamano <>
2007-12-14xdiff tail trimming: use correct type.Junio C Hamano
Inside xdiff library, the number of context lines is represented in long, not int. Noticed by Peter Baumann. Signed-off-by: Junio C Hamano <>
2007-12-14Add tests for "git diff --check" with core.whitespace optionsWincent Colaiuta
Make sure that "git diff --check" does the right thing when the core.whitespace options are set. While we are at it, correct many uses of test_expect_failure that ran sequence of commands. Signed-off-by: Wincent Colaiuta <> Signed-off-by: Junio C Hamano <>
2007-12-14Make "diff --check" output match "git apply"Wincent Colaiuta
For consistency, make the two tools report whitespace errors in the same way (the output of "diff --check" has been tweaked to match that of "git apply"). Note that although the textual content is basically the same only "git diff --check" provides a colorized version of the problematic lines; making "git apply" do colorization will require more extensive changes (figuring out the diff colorization preferences of the user) and so that will be a subject for another commit. Signed-off-by: Wincent Colaiuta <> Signed-off-by: Junio C Hamano <>
2007-12-14Unify whitespace checkingWincent Colaiuta
This commit unifies three separate places where whitespace checking was performed: - the whitespace checking previously done in builtin-apply.c is extracted into a function in ws.c - the equivalent logic in "git diff" is removed - the emit_line_with_ws() function is also removed because that also rechecks the whitespace, and its functionality is rolled into ws.c The new function is called check_and_emit_line() and it does two things: checks a line for whitespace errors and optionally emits it. The checking is based on lines of content rather than patch lines (in other words, the caller must strip the leading "+" or "-"); this was suggested by Junio on the mailing list to allow for a future extension to "git show" to display whitespace errors in blobs. At the same time we teach it to report all classes of whitespace errors found for a given line rather than reporting only the first found error. Signed-off-by: Wincent Colaiuta <> Signed-off-by: Junio C Hamano <>
2007-12-14diff --check: minor fixupsJunio C Hamano
There is no reason --exit-code and --check-diff must be mutually exclusive, so assign different bits to different results and allow them to be returned from the command. Introduce diff_result_code() to factor out the common code to decide final status code based on diffopt settings and use it everywhere. Update tests to match the above fix. Turning pager off when "diff --check" is used is a regression. Signed-off-by: Junio C Hamano <>
2007-12-14"diff --check" should affect exit statusWincent Colaiuta
"git diff" has a --check option that can be used to check for whitespace problems but it only reported by printing warnings to the console. Now when the --check option is used we give a non-zero exit status, making "git diff --check" nicer to use in scripts and hooks. Signed-off-by: Wincent Colaiuta <> Signed-off-by: Junio C Hamano <>
2007-12-14xdi_diff: trim common trailing linesJunio C Hamano
This implements earlier Linus's optimization to trim common lines at the end before passing them down to low level xdiff interface for all of our xdiff users. We could later enhance this to also trim common leading lines, but that would need tweaking the output function to add the number of lines trimmed at the beginning to line numbers that appear in the hunk headers. Signed-off-by: Junio C Hamano <>
2007-12-14xdl_diff: identify call sites.Junio C Hamano
This inserts a new function xdi_diff() that currently does not do anything other than calling the underlying xdl_diff() to the callchain of current callers of xdl_diff() function. Signed-off-by: Junio C Hamano <>
2007-12-14provide advance warning of some future pack default changesNicolas Pitre
Signed-off-by: Nicolas Pitre <> Signed-off-by: Junio C Hamano <>
2007-12-13git-svn: unlink internal index files after operationsEric Wong
Being git, we can generate these very quickly on the fly as needed, so there's no point in wasting space for these things for large projects. Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2007-12-13git-svn: expand handling of From: and Signed-off-by:Andy Whitcroft
The current parsing for From: and Signed-off-by: lines handles fully specified names: From: Full Name <email@address> Expand this to include the raw email addresses and straight "names": From: email@address -> email <email@address> From: Full Name -> Full Name <unknown> Signed-off-by: Andy Whitcroft <> Acked-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2007-12-13Fix spelling mistakes in user manualShawn Bohrer
Signed-off-by: Shawn Bohrer <> Acked-by: J. Bruce Fields <> Signed-off-by: Junio C Hamano <>
2007-12-13git-commit: squelch needless message during an empty mergeJunio C Hamano
When recording a merge that conflicted and ends up in no changes after manual resolution, commit callchain looked like this: cmd_commit() -> prepare_log_message() -> run_status() -> wt_status_print() This invocation of run_status() is asked to find out if there is a committable change, but it unconditionally gave instructions such as "use git-add" at the same time. When in merge, we do allow an empty change to be recorded, so after showing this message the code still went ahead and made a commit. This introduces "nowarn" parameter to run_status() to avoid these useless messages. If we are not allowed to create an empty commit, we already call run_status() again in the original codepath, and the message will be shown from that call anyway. Signed-off-by: Junio C Hamano <>
2007-12-13GIT 1.5.4-rc0v1.5.4-rc0Junio C Hamano
Signed-off-by: Junio C Hamano <>
2007-12-13Merge branch 'cc/help'Junio C Hamano
* cc/help: RPM spec: Adjust htmldir git-help -w: do not require to be in git repository remove python_path Documentation: rename git.texi to user-manual.texi Add git-browse-help to .gitignore git-help -i: show info documentation from matching version of git git-help -i: invoke info with document and node name Documentation: add target Documentation: describe -w/--web option to "git-help". Use {web,instaweb,help}.browser config options. git-help: add -w|--web option to display html man page in a browser. Documentation: describe -i/--info option to "git-help" git-help: add -i|--info option to display info page.
2007-12-13RPM spec: Adjust htmldirJunio C Hamano
git help -w needs to know the right location of installed pages. Signed-off-by: Junio C Hamano <>
2007-12-13git-help -w: do not require to be in git repositoryJunio C Hamano
The users used to be able to say "git help cat-file" from anywhere, but the browse-help script insisted to be in a git repository, which caused "git help -w cat-file" to barf outside. Correct it. While at it, remove leftover debugging "echo". Signed-off-by: Junio C Hamano <>
2007-12-13Merge branch 'jc/shortlog-e'Junio C Hamano
* jc/shortlog-e: shortlog: default to HEAD when the standard input is a tty Invert numbers and names in the git-shortlog summary mode. shortlog: document -e option git-shortlog -e: show e-mail address as well