AgeCommit message (Collapse)Author
2007-12-11Don't cache DESTDIR in perl/perl.mak.Gerrit Pape
DESTDIR is supposed to be overridden on 'make install' after doing 'make'. Have the automatically generated perl/perl.mak not cache the value of DESTDIR to support that for the perl/ subdirectory also. Signed-off-by: Gerrit Pape <> Signed-off-by: Junio C Hamano <>
2007-12-11autoconf: Check asciidoc version to automatically set ASCIIDOC8Jakub Narebski
Check for asciidoc, and if it exists check asciidoc version, setting ASCIIDOC8 when needed. Currently it just runs asciidoc in asciidoc7 compatibility mode (see: Documentation/Makefile). Signed-off-by: Jakub Narebski <> Signed-off-by: Junio C Hamano <>
2007-12-11pack-objects: more threaded load balancing fix with often changed pathsNicolas Pitre
The code that splits the object list amongst work threads tries to do so on "path" boundaries not to prevent good delta matches. However, in some cases, a few paths may largely dominate the hash distribution and it is not possible to have good load balancing without ignoring those boundaries. Signed-off-by: Nicolas Pitre <> Signed-off-by: Junio C Hamano <>
2007-12-10Add more checkout testsDaniel Barkalow
If you have local changes that don't conflict with the branch-switching changes, these should be kept, not cause errors even without -m, and be reported afterwards in name-status format. With -m, the changes carried across should be listed as well. And, for now, include the merge-recursive output from this process. Also test the detatched head message in at least one case. Signed-off-by: Daniel Barkalow <> Signed-off-by: Junio C Hamano <>
2007-12-10Fix mis-markup of the -p, --patch option in git-add(1)Eyvind Bernhardsen
An item in a bulletted list in AsciiDoc is followed with two colons, not just one. Signed-off-by: Eyvind Bernhardsen <> Signed-off-by: Junio C Hamano <>
2007-12-10Update draft Release Notes for 1.5.4Junio C Hamano
Signed-off-by: Junio C Hamano <>
2007-12-10Style fixes for pre-commit hook testsWincent Colaiuta
As pointed out by Junio on the mailing list, surrounding tests in double quotes can lead to bugs wherein variables get substituted away, so this isn't just style churn but important to prevent others from looking at these tests in the future and thinking that this is "the way" that Git tests should be written. Signed-off-by: Wincent Colaiuta <> Signed-off-by: Junio C Hamano <>
2007-12-10Interactive editor tests for commit-msg hookWincent Colaiuta
Supplement the existing tests for the commit-msg hook (which all use "git commit -m") with tests which use an interactive editor (no -m switch) to ensure that all code paths get tested. At the same time the quoting of some of the existing tests is changed to conform to Junio's recommendations for test style (single quotes used around the test unless there is a compelling reason not to, and the opening quote on the same line as the test_expect and the closing quote in column 1). Signed-off-by: Wincent Colaiuta <> Signed-off-by: Junio C Hamano <>
2007-12-09Re-fix ls-remoteJunio C Hamano
An earlier attempt in 2ea7fe0 (ls-remote: resurrect pattern limit support) forgot that the user string can also be a glob. This should finally fix it. Signed-off-by: Junio C Hamano <>
2007-12-09Cleanup variables in http.[ch]Mike Hommey
Quite some variables defined as extern in http.h are only used in http.c, and some others, only defined in http.c, were not static. Signed-off-by: Mike Hommey <> Signed-off-by: Junio C Hamano <>
2007-12-09git-send-email.perl: Really add angle brackets to In-Reply-To if necessaryMike Hommey
3803bcea tried to fix this, but it only adds the branckes when the given In-Reply-To begins and ends with whitespaces. It also didn't do anything to the --in-reply-to argument. Signed-off-by: Mike Hommey <> Signed-off-by: Junio C Hamano <>
2007-12-09don't mention index refreshing side effect in git-status docsJeff King
The tip about speeding up subsequent operations is now obsolete; since aecbf914, git-diff now squelches empty diffs and performs an automatic refresh. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
2007-12-09Remove repo version check from setup_git_directoryNguyễn Thái Ngọc Duy
setup_git_directory_gently has done the check already. Signed-off-by: Nguyễn Thái Ngọc Duy <> Signed-off-by: Junio C Hamano <>
2007-12-09Merge branch 'jc/spht'Junio C Hamano
* jc/spht: Use gitattributes to define per-path whitespace rule core.whitespace: documentation updates. builtin-apply: teach whitespace_rules builtin-apply: rename "whitespace" variables and fix styles core.whitespace: add test for diff whitespace error highlighting git-diff: complain about >=8 consecutive spaces in initial indent War on whitespace: first, a bit of retreat. Conflicts: cache.h config.c diff.c
2007-12-09Merge branch 'pr/mergetool'Junio C Hamano
* pr/mergetool: Open external merge tool with original file extensions for all three files
2007-12-09Merge branch 'maint'Junio C Hamano
* maint: config.c:store_write_pair(): don't read the byte before a malloc'd buffer.
2007-12-09Re-fix "builtin-commit: fix --signoff"Junio C Hamano
An earlier fix to the said commit was incomplete; it mixed up the meaning of the flag parameter passed to the internal fmt_ident() function, so this corrects it. git_author_info() and git_committer_info() can be told to issue a warning when no usable user information is found, and optionally can be told to error out. Operations that actually use the information to record a new commit or a tag will still error out, but the caller to leave reflog record will just silently use bogus user information. Not warning on misconfigured user information while writing a reflog entry is somewhat debatable, but it is probably nicer to the users to silently let it pass, because the only information you are losing is who checked out the branch. * git_author_info() and git_committer_info() used to take 1 (positive int) to error out with a warning on misconfiguration; this is now signalled with a symbolic constant IDENT_ERROR_ON_NO_NAME. * These functions used to take -1 (negative int) to warn but continue; this is now signalled with a symbolic constant IDENT_WARN_ON_NO_NAME. * fmt_ident() function implements the above error reporting behaviour common to git_author_info() and git_committer_info(). A symbolic constant IDENT_NO_DATE can be or'ed in to the flag parameter to make it return only the "Name <email@address.xz>". * fmt_name() is a thin wrapper around fmt_ident() that always passes IDENT_ERROR_ON_NO_NAME and IDENT_NO_DATE. Signed-off-by: Junio C Hamano <>
2007-12-09Add tests for pre-commit and commit-msg hooksWincent Colaiuta
As desired, these pass for, fail for builtin-commit (prior to the fixes), and succeeded for builtin-commit (after the fixes). Signed-off-by: Wincent Colaiuta <> Signed-off-by: Junio C Hamano <>
2007-12-09Fix commit-msg hook to allow editingJunio C Hamano
The old script allowed the commit-msg hook to not only prevent a commit from proceding, but also to edit the commit message on the fly and allow it to proceed. So here we teach builtin-commit to do the same. This is based on Wincent's patch, but redone with a clarified logic. Signed-off-by: Junio C Hamano <>
2007-12-09Documentation: fix --no-verify documentation for "git commit"Wincent Colaiuta
The documentation for the --no-verify switch should mention the commit-msg hook, not just the pre-commit hook. Signed-off-by: Wincent Colaiuta <> Signed-off-by: Junio C Hamano <>
2007-12-09Allow --no-verify to bypass commit-msg hookWincent Colaiuta
At the moment the --no-verify switch to "git commit" instructs it to skip over the pre-commit hook. Here we teach "git commit --no-verify" to skip over the commit-msg hook as well. This brings the behaviour of builtin-commit back in line with Signed-off-by: Wincent Colaiuta <> Signed-off-by: Junio C Hamano <>
2007-12-09ls-remote: resurrect pattern limit supportJunio C Hamano
"git ls-remote $remote $name1 $name2..." used to limit the output to refs that end with one of the $name given from the command line, but recent rewrite to C forgot to implement that support. Signed-off-by: Junio C Hamano <>
2007-12-08config.c:store_write_pair(): don't read the byte before a malloc'd buffer.Jim Meyering
Signed-off-by: Jim Meyering <> Signed-off-by: Junio C Hamano <>
2007-12-08shortlog: code restructuring and clean-upJunio C Hamano
The code tried to parse and clean-up the author name and the one line information in three places (two callers of insert_author_oneline() and the called function itself), which was a mess. This renames the callee to insert_one_record() and make it responsible for cleaning up the author name and one line information. Signed-off-by: Junio C Hamano <>
2007-12-08mailmap: fix bogus for() loop that happened to be safe by accidentJunio C Hamano
The empty loop pretended to have an empty statement as its body by a phony indentation, but in fact was slurping the next statement into it. Signed-off-by: Junio C Hamano <>
2007-12-08pack-objects: fix threaded load balancingNicolas Pitre
The current method consists of a master thread serving chunks of objects to work threads when they're done with their previous chunk. The issue is to determine the best chunk size: making it too large creates poor load balancing, while making it too small has a negative effect on pack size because of the increased number of chunk boundaries and poor delta window utilization. This patch implements a completely different approach by initially splitting the work in large chunks uniformly amongst all threads, and whenever a thread is done then it steals half of the remaining work from another thread with the largest amount of unprocessed objects. This has the advantage of greatly reducing the number of chunk boundaries with an almost perfect load balancing. Signed-off-by: Nicolas Pitre <> Signed-off-by: Junio C Hamano <>
2007-12-08pack-objects: reverse the delta search sort listNicolas Pitre
It is currently sorted and then walked backward. Not only this doesn't feel natural for my poor brain, but it would make the next patch less obvious as well. So reverse the sort order, and reverse the list walking direction, which effectively produce the exact same end result as before. Also bring the relevant comment nearer the actual code and adjust it accordingly, with minor additional clarifications. Signed-off-by: Nicolas Pitre <> Signed-off-by: Junio C Hamano <>
2007-12-08pack-objects: fix delta cache size accountingNicolas Pitre
The wrong value was substracted from delta_cache_size when replacing a cached delta, as trg_entry->delta_size was used after the old size had been replaced by the new size. Noticed by Linus. Signed-off-by: Nicolas Pitre <> Signed-off-by: Junio C Hamano <>
2007-12-08git-status: documentation improvementsJeff King
This patch is the result of reading over git-status with an editorial eye: - fix a few typo/grammatical errors - mention untracked output - present output types in the order they appear from the command Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
2007-12-08add status.relativePaths config variableJeff King
The output of git-status was recently changed to output relative paths. Setting this variable to false restores the old behavior for any old-timers that prefer it. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
2007-12-08wt-status.c:quote_path(): convert empty path to "./"Jeff King
Now that we are correctly removing leading prefixes from files in git status, there is a degenerate case: the directory matching the prefix. Because we show only the directory name for a directory that contains only untracked files, it gets collapsed to an empty string. Example: $ git init $ mkdir subdir $ touch subdir/file $ git status ... # Untracked files: # (use "git add <file>..." to include in what will be committed) # # subdir/ So far, so good. $ cd subdir $ git status .... # Untracked files: # (use "git add <file>..." to include in what will be committed) # # Oops, that's a bit confusing. This patch prints './' to show that there is some output. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
2007-12-08git-bisect visualize: work in non-windowed environments betterJunio C Hamano
This teaches "git bisect visualize" to be more useful in non-windowed environments. (1) When no option is given, and $DISPLAY is set, it continues to spawn gitk as before; (2) When no option is given, and $DISPLAY is unset, "git log" is run to show the range of commits between the bad one and the good ones; (3) If only "-flag" options are given, "git log <options>" is run. E.g. "git bisect visualize --stat" (4) Otherwise, all of the given options are taken as the initial part of the command line and the commit range expression is given to that command. E.g. "git bisect visualize tig" will run "tig" history viewer to show between the bad one and the good ones. As "visualize" is a bit too long to type, we also give it a shorter synonym "view". Signed-off-by: Junio C Hamano <>
2007-12-08Teach "git add -i" to colorize whitespace errorsWincent Colaiuta
Rather than replicating the colorization logic of "git diff-files" we rely on "git diff-files" itself. This guarantees consistent colorization in and outside "git add -i". Seeing as speed is not a concern here (the bottleneck is how fast the user can read, not how fast "git diff-files" runs) we do this by actually running it twice, once without color and once with. In this way as the whitespace colorization provided by "git diff-files" evolves (per-path attributes, new classes of whitespace error), "git add -i" will automatically benefit from it and stay in synch. Also, by working with two sets of diff output (an uncolorized one for internal processing and a colorized one for display only) we minimize the risk of regressions because the changes required to implement this are minimally invasive. Signed-off-by: Wincent Colaiuta <> Signed-off-by: Junio C Hamano <>
2007-12-08Let git-help prefer man-pages installed with this version of gitSergei Organov
Prepend $(prefix)/share/man to the MANPATH environment variable before invoking 'man' from help.c:show_man_page(). There may be other git documentation in the user's MANPATH but the user is asking a specific instance of git about its own documentation, so we'd better show the documentation for _that_ instance of git. Signed-off-by: Sergei Organov <> Signed-off-by: Junio C Hamano <>
2007-12-07Update draft release notes to 1.5.4Junio C Hamano
Signed-off-by: Junio C Hamano <>
2007-12-07Merge branch 'master' of git:// C Hamano
* 'master' of git:// Update Hungarian translation. 100% completed. Update ja.po for git-gui git-gui: Improve the application icon on Windows. git-gui: install-sh from automake does not like -m755 git-gui: Reorder msgfmt command-line arguments Update German translation. 100% completed. Update git-gui.pot with latest (few) string additions and changes. git-gui: update it.po and glossary/it.po git-gui: fix a typo in lib/commit.tcl
2007-12-07Merge branch 'mw/cvsserver'Junio C Hamano
* mw/cvsserver: git-cvsserver runs hooks/post-update git-cvsserver runs hooks/post-receive
2007-12-07Merge branch 'kh/fetch-optparse'Junio C Hamano
* kh/fetch-optparse: Rewrite builtin-fetch option parsing to use parse_options().
2007-12-07Merge branch 'jc/git-log-doc'Junio C Hamano
* jc/git-log-doc: Include diff options in the git-log manpage
2007-12-07Merge branch 'jc/addi-color'Junio C Hamano
* jc/addi-color: config --get-colorbool: diff.color is a deprecated synonym to color.diff Color support for "git-add -i" git config --get-colorbool
2007-12-07Merge branch 'jc/docmake-perl'Junio C Hamano
* jc/docmake-perl: Run the specified perl in Documentation/
2007-12-07Merge branch 'jc/clean-fix'Junio C Hamano
* jc/clean-fix: t7300: add test for clean with wildcard pathspec git-clean: Honor pathspec.
2007-12-07autoconf: Add test for OLD_ICONV (squelching compiler warning)Jakub Narebski
Update (and to keep up with git development by adding [compile] test whether your library has an old iconv(), where the second (input buffer pointer) parameter is declared with type (const char **) (OLD_ICONV). Test-proposed-by: Linus Torvalds <> Signed-off-by: Jakub Narebski <> Signed-off-by: Junio C Hamano <>
2007-12-07Silence iconv warnings on LeopardWincent Colaiuta
Apple ships a newer version of iconv with Leopard (Mac OS X 10.5/Darwin 9). Ensure that OLD_ICONV is not set on any version of Darwin in the 9.x series; this should be good for at least a couple of years, when Darwin 10 comes out and we can invert the sense of the test to specifically check for Darwin 7 or 8. A more sophisticated and robust check is possible for those who use autoconf, but not everybody does that. Signed-off-by: Wincent Colaiuta <> Signed-off-by: Junio C Hamano <>
2007-12-07Merge branch 'maint'Junio C Hamano
* maint: Change from using to as example domain, as per RFC 2606.
2007-12-07Change from using to as example domain, as per RFC 2606.David Symonds
Signed-off-by: David Symonds <> Signed-off-by: Junio C Hamano <>
2007-12-06git-status documentation: mention subdirectory behaviourJunio C Hamano
Consistently with all other diff oriented commands, we have given paths relative to the work tree root in git-status output for a long time. This documents the recent behaviour change, as people's eyes (and worse yet, scripts, although scripts should not parse "git status" output) may depend on the old behaviour. In the longer run, giving a --full-name option to git-diff Porcelain similar to what ls-files has, and change the default for git-diff Porcelain to show relative paths may be a good thing to do, in order to hide the oddballness of this git-status behaviour, but that would have a rather large impact to established expectation by existing users. Signed-off-by: Junio C Hamano <>
2007-12-06do not discard status in fetch_refs_via_pack()Junio C Hamano
The code calls fetch_pack() to get the list of refs it fetched, and discards refs and always returns 0 to signal success. But builtin-fetch-pack.c::fetch_pack() has error cases. The function returns NULL if error is detected (shallow-support side seems to choose to die but I suspect that is easily fixable to error out as well). Make fetch_refs_via_pack() propagate that error to the caller. Acked-By: Daniel Barkalow <> Signed-off-by: Junio C Hamano <>
2007-12-06for-each-ref: Fix quoting style constants.Johannes Sixt
for-each-ref can accept only one quoting style. For this reason it uses OPT_BIT for the quoting style switches so that it is easy to check for more than one bit being set. However, not all symbolic constants were actually single bit values. In particular: $ git for-each-ref --python error: more than one quoting style ? This fixes it. While we are here, let's also remove the space before the question mark. Signed-off-by: Johannes Sixt <> Signed-off-by: Junio C Hamano <>
2007-12-06hg-to-git: handle an empty dir in hg.Junio C Hamano
Mark Drago had a subversion repository which was then converted to hg and now is moving in to git. The first commit in the svn repo was just the creation of the empty directory. This made its way in to the hg repository fine, but converting from hg to git would cause an error. The problem was that tries to commit the change, git-commit fails, and then tries to checkout the new revision and that fails (because it was not created). This may have only caused an error because it was the first commit in the repository. If an empty directory was added in the middle of the repo somewhere things might have worked out fine. This patch will use the new --allow-empty option to git-commit to record such an "empty" commit, to reproduce the history recorded in hg more faithfully. Tested-by: Mark Drago <> Signed-off-by: Junio C Hamano <>