AgeCommit message (Collapse)Author
2008-03-03Fix doc typos.Ralf Wildenhues
Signed-off-by: Ralf Wildenhues <> Signed-off-by: Junio C Hamano <>
2008-03-03fast-import: exit with proper message if not a git dirJean-Luc Herren
git fast-import expects to be run from an existing (possibly empty) repository. It was dying with a suboptimal message if that wasn't the case. Signed-off-by: Jean-Luc Herren <> Acked-by: Shawn O. Pearce <>
2008-03-03Merge branch 'np/verify-pack'Junio C Hamano
* np/verify-pack: add storage size output to 'git verify-pack -v' fix unimplemented packed_object_info_detail() features make verify_one_pack() a bit less wrong wrt packed_git structure factorize revindex code out of builtin-pack-objects.c Conflicts: Makefile
2008-03-02format-patch: wrap cover-letter's shortlog sensiblyJohannes Schindelin
Earlier, overly-long onelines would not be wrapped at all, and indented with 6 spaces. Instead, we now wrap around at 72 characters, with a first-line indent of 2 spaces, and the rest with 4 spaces. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2008-03-02format-patch: use the diff options for the cover letter, tooJohannes Schindelin
Earlier, when you called "git format-patch --cover-letter -M", the diffstat in the cover letter would not inherit the "-M". Now it does. While at it, add a few "|| break" statements in the test's loops; otherwise, breakages inside the loops would not be caught. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2008-03-02gitweb: Mark first match when searching commit messagesJakub Narebski
Due to greediness of a pattern, gitweb used to mark (show) last match in line, if there are more than one match in line. Now it shows first. Showing all matches in a line would require further work. Signed-off-by: Jakub Narebski <> Signed-off-by: Junio C Hamano <>
2008-03-02Merge branch 'sp/describe-tag'Junio C Hamano
* sp/describe-tag: Teach git-describe to verify annotated tag names before output Conflicts: builtin-describe.c
2008-03-02Merge branch 'pb/cvsimport'Junio C Hamano
* pb/cvsimport: cvsimport: document that -M can be used multiple times cvsimport: allow for multiple -M options cvsimport: have default merge regex allow for dashes in the branch name
2008-03-02Merge branch 'jc/maint-log-merge-left-right'Junio C Hamano
* jc/maint-log-merge-left-right: Fix "git log --merge --left-right"
2008-03-02Merge branch 'mh/maint-http-proxy-fix'Junio C Hamano
* mh/maint-http-proxy-fix: Set proxy override with http_init()
2008-03-02Merge branch 'cb/http-test'Junio C Hamano
* cb/http-test: http-push: add regression tests http-push: push <remote> :<branch> deletes remote branch
2008-03-02Merge branch 'jc/remote-multi-url'Junio C Hamano
* jc/remote-multi-url: git-remote: do not complain on multiple URLs for a remote
2008-03-02Merge branch 'jn/gitweb-grep'Junio C Hamano
* jn/gitweb-grep: gitweb: Clearly distinguish regexp / exact match searches gitweb: Simplify fixed string search gitweb: Change parse_commits signature to allow for multiple options
2008-03-02Merge branch 'mk/maint-parse-careful'Junio C Hamano
* mk/maint-parse-careful: receive-pack: use strict mode for unpacking objects index-pack: introduce checking mode unpack-objects: prevent writing of inconsistent objects unpack-object: cache for non written objects add common fsck error printing function builtin-fsck: move common object checking code to fsck.c builtin-fsck: reports missing parent commits Remove unused object-ref code builtin-fsck: move away from object-refs to fsck_walk add generic, type aware object chain walker Conflicts: Makefile builtin-fsck.c
2008-03-02Merge branch 'sb/describe-long'Junio C Hamano
* sb/describe-long: git-describe: --long shows the object name even for a tagged commit
2008-03-02Merge branch 'ew/maint-svn-cert-fileprovider'Junio C Hamano
* ew/maint-svn-cert-fileprovider: git-svn: Don't prompt for client cert password everytime.
2008-03-02Merge branch 'js/maint-daemon'Junio C Hamano
* js/maint-daemon: daemon: ensure that base-path is an existing directory daemon: send more error messages to the syslog
2008-03-02Documentation: Remove --{min,max}-age option from git-log(1)Jakub Narebski
The --max-age=<timestamp> and --min-age=<timestamp> are now shown only in the git-rev-list manpage (plumbing). Signed-off-by: Jakub Narebski <> Signed-off-by: Junio C Hamano <>
2008-03-02cleanup: remove unused git_checkout_configDenis Cheng
Directly call git_default_config instead. Signed-off-by: Denis Cheng <> Signed-off-by: Junio C Hamano <>
2008-03-02Fix make_absolute_path() for parameters without a slashJohannes Schindelin
When passing "xyz" to make_absolute_path(), make_absolute_path() erroneously tried to chdir("xyz"), and then append "/xyz". Instead, skip the chdir() completely when no slash was found. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2008-03-02diff: make sure work tree side is shown as 0{40} when differentJunio C Hamano
Ping Yin noticed that "git diff-index --raw" shows 0{40} when work tree has submodule difference, but "git diff --raw" didn't correctly do so. There was a mistake in the diffcore_skip_stat_unmatch() that was meant to clean up the stat-only difference for running diff between the index and work tree and diff between the tree and the work tree, to cause it re-read from the submodule repository HEAD. When ce_stat_match() says work tree is different, we should always say 0{40} on the work tree side. This patch fixes the issue, and adds tests. Signed-off-by: Junio C Hamano <>
2008-03-02diff-lib.c: constness strengtheningJunio C Hamano
The internal implementation of diff-index codepath used to use non const pointer to pass sha1 around, but it did not have to. With this, we can also lose the private no_sha1[] array, as we can use the public null_sha1[] array that exists exactly for the same purpose. Signed-off-by: Junio C Hamano <>
2008-03-02Clean up find_unique_abbrev() callersJunio C Hamano
Now find_unique_abbrev() never returns NULL, there is no need for callers to prepare for seeing NULL and fall back to giving the full 40-hexdigits. While we are at it, drop "..." in the "git reset" output that reports the location of the new HEAD, between the abbreviated commit object name and the one line commit summary. Because we are always showing the HEAD (which cannot be missing!), we never had a case where we show the full 40 hexdigits that is not followed by three dots, and these three dots were stealing 3 columns from the precious horizontal screen real estate out of 80 that can better be used for the one line commit summary. Signed-off-by: Junio C Hamano <>
2008-03-02find_unique_abbrev(): redefine semanticsJunio C Hamano
The function returned NULL when no object that matches the name was found, but that made the callers more complicated, as nobody used that NULL return as an indication that no object with such a name exists. They (at least the careful ones) instead took the full 40-hexdigit and used in such a case, and the careless ones segfaulted. With this "git rev-parse --short 5555555555555555555555555555555555555555" would stop segfaulting. This is based on Jeff King's rewrite to my RFC patch, but "missing" logic swapped to "exists". The final logic reads: For existing objects, make sure the abbreviated string uniquely identifies it. Otherwise, make sure the abbreviated string is long enough so that it would not name any existing object. Signed-off-by: Junio C Hamano <>
2008-03-02git rebase --abort: always restore the right commitMike Hommey
Previously, --abort would end by git resetting to ORIG_HEAD, but some commands, such as git reset --hard (which happened in git rebase --skip, but could just as well be typed by the user), would have already modified ORIG_HEAD. Just use the orig-head we store in $dotest instead. Signed-off-by: Mike Hommey <> Signed-off-by: Junio C Hamano <>
2008-03-02Documentation/git-rebase.txt: Add --strategy to synopsysMike Hommey
Signed-off-by: Mike Hommey <> Signed-off-by: Junio C Hamano <>
2008-03-02CodingGuidelines: spell out how we use grep in our scriptsJunio C Hamano
Our scripts try to stick to fairly limited subset of POSIX BRE for portability. It is unclear from manual page from GNU grep which is GNU extension and which is portable, so let's spell it out to help new people to keep their contributions from hurting porters. Signed-off-by: Junio C Hamano <>
2008-03-01add storage size output to 'git verify-pack -v'Nicolas Pitre
This can possibly break external scripts that depend on the previous output, but those script can't possibly be critical to Git usage, and fixing them should be trivial. Signed-off-by: Nicolas Pitre <> Signed-off-by: Junio C Hamano <>
2008-03-01fix unimplemented packed_object_info_detail() featuresNicolas Pitre
Since commit eb32d236df0c16b936b04f0c5402addb61cdb311, there was a TODO comment in packed_object_info_detail() about the SHA1 of base object to OBJ_OFS_DELTA objects. So here it is at last. While at it, providing the actual storage size information as well is now trivial. Signed-off-by: Nicolas Pitre <> Signed-off-by: Junio C Hamano <>
2008-03-01make verify_one_pack() a bit less wrong wrt packed_git structureNicolas Pitre
Simply freeing it is wrong. There are many things attached to this structure that are not cleaned up. In practice this doesn't matter much since this happens just before the program exits, but it is still a bit more "correct" to leak it implicitly rather than explicitly. And therefore it is also a good idea to register it with install_packed_git(). Not only might it have better chance of being properly cleaned up if such functionality is implemented for the general case, but some functions like init_revindex() expect all packed_git instances to be globally accessible. Signed-off-by: Nicolas Pitre <> Signed-off-by: Junio C Hamano <>
2008-03-01factorize revindex code out of builtin-pack-objects.cNicolas Pitre
No functional change. This is needed to fix verify-pack in a later patch. Signed-off-by: Nicolas Pitre <> Signed-off-by: Junio C Hamano <>
2008-03-01allow git-am to run in a subdirectoryJeff King
We just move to the top of the tree and proceed. This shouldn't break any existing callers, since the behavior was previously disallowed. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
2008-03-01rename: warn user when we have turned off rename detectionJeff King
Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
2008-03-01Add test for git rebase --abortMike Hommey
We expect git rebase --abort to come back to the original (pre-rebase) head, independently from when it's run during a rebase. Signed-off-by: Mike Hommey <> Signed-off-by: Junio C Hamano <>
2008-03-01t6024: move "git reset" to prepare for a test inside the test itselfJunio C Hamano
Noticed by Mike Hommey. Signed-off-by: Junio C Hamano <>
2008-03-01gc: Add --quiet optionFrank Lichtenheld
Pass -q option to git-repack. Signed-off-by: Frank Lichtenheld <> Signed-off-by: Junio C Hamano <>
2008-03-01cvsimport: document that -M can be used multiple timesPhilippe Bruhat (BooK
Also document the capture behaviour (source branch name in $1) Signed-off-by: Philippe Bruhat (BooK) <> Signed-off-by: Junio C Hamano <>
2008-03-01cvsimport: allow for multiple -M optionsPhilippe Bruhat (BooK
Use Getopt::Long instead of Getopt::Std to handle multiple -M options, for all the cases when having a single custom regex is not enough. Signed-off-by: Philippe Bruhat (BooK) <> Signed-off-by: Junio C Hamano <>
2008-03-01cvsimport: have default merge regex allow for dashes in the branch namePhilippe Bruhat (BooK
The default value of @mergerx uses \w, which matches word character; a branch name like policy-20050608-br will not be matched. Signed-off-by: Philippe Bruhat (BooK) <> Signed-off-by: Junio C Hamano <>
2008-03-01Merge branch 'master' of git:// C Hamano
* 'master' of git:// git-gui: fix typo in lib/spellcheck.tcl git-gui: Shorten Aspell version strings to just Aspell version number git-gui: Gracefully display non-aspell version errors to users git-gui: Catch and display aspell startup failures to the user git-gui: Only bind the spellcheck popup suggestion hook once git-gui: Remove explicit references to 'aspell' in message strings git-gui: Ensure all spellchecker 'class' variables are initialized git-gui: Update German translation. git-gui: (i18n) Add newly added translation strings to template.
2008-03-01Merge branch 'maint'Junio C Hamano
* maint: Documentation cherry-pick: Fix cut-and-paste error git.el: find the git-status buffer whatever its name is git-gui: Paper bag fix info dialog when no files are staged at commit
2008-03-01Documentation cherry-pick: Fix cut-and-paste errorMike Ralphson
Signed-off-by: Mike Ralphson <> Signed-off-by: Junio C Hamano <>
2008-03-01git.el: find the git-status buffer whatever its name isRémi Vanicat
git-status used the buffer name to find git-status buffers, and that can fail if the buffer has another name, for example when multiple working directories is tracked. Signed-off-by: Rémi Vanicat <> Acked-by: Alexandre Julliard <> Tested-by: Xavier Maillard <> Signed-off-by: Junio C Hamano <>
2008-03-01Merge branch 'maint' of git:// into maintJunio C Hamano
* 'maint' of git:// git-gui: Paper bag fix info dialog when no files are staged at commit
2008-03-01clone: support cloning full bundlesSanti Béjar
The "humanish" part of a bundle is made removing the ".bundle" suffix. Signed-off-by: Santi Béjar <> Signed-off-by: Junio C Hamano <>
2008-02-29Update draft release notes for 1.5.5Junio C Hamano
Signed-off-by: Junio C Hamano <>
2008-02-29use build-time SHELL_PATH in test scriptsJeff King
The top-level Makefile now creates a GIT-BUILD-OPTIONS file which stores any options selected by the make process that may be of use to further parts of the build process. Specifically, we store the SHELL_PATH so that it can be used by tests to construct shell scripts on the fly. The format of the GIT-BUILD-OPTIONS file is Bourne shell, and it is sourced by; all tests can rely on just having $SHELL_PATH correctly set in the environment. The GIT-BUILD-OPTIONS file is written every time the toplevel 'make' is invoked. Since the only users right now are the test scripts, there's no drawback to updating its timestamp. If something build-related depends on this, we can do a trick similar to the one used by GIT-CFLAGS. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
2008-02-29Write index file on any checkout of filesDaniel Barkalow
We need to rewrite the index file when we check out files, even if we haven't modified the blob info by reading from another tree, so that we get the stat cache to include the fact that we just modified the file so it doesn't need to be refreshed. While we're at it, move everything that needs to be done to check out some paths from a tree (or the current index) into checkout_paths(). Signed-off-by: Daniel Barkalow <> Signed-off-by: Junio C Hamano <>
2008-02-29rev-list: add --branches, --tags and --remotesUwe Kleine-König
These flags are already known to rev-parse and have the same meaning. This patch allows to run gitk as follows: gitk --branches --not --remotes to show only your local work. Signed-off-by: Uwe Kleine-König <> Signed-off-by: Junio C Hamano <>
2008-02-29Improve t6029 to check the real "subtree" caseMiklos Vajna
t6029 already checks if subtree available and works like recursive. This patch adds code to test test the extra functionality the subtree merge strategy provides. Signed-off-by: Miklos Vajna <> Signed-off-by: Junio C Hamano <>