| 62e4f26 | Jakub Narebski | 07 January 2007, 01:52:23 UTC | gitweb: Fix error in git_patchest_body for file creation/deletion patch $from_id, $to_id variables should be local per PATCH. Fix error in git_patchset_body for file creation (deletion) patches, where instead of /dev/null as from-file (to-file) diff header line, it had link to previous file with current file name. This error occured only if there was another patch before file creation (deletion) patch. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:52:49 UTC |
| fffe694 | Eric Wong | 07 January 2007, 06:25:55 UTC | git-svn: fix show-ignore Looks like I broke it in 747fa12cef73b6ca04fffaddaad7326cf546cdea but never noticed. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:48:48 UTC |
| 84dee6b | J. Bruce Fields | 07 January 2007, 03:38:38 UTC | Documentation: tutorial editing Edit for conciseness. Add a "Making changes" section header. When possible, make sure that stuff in text boxes could be entered literally. (Don't use "..." unless we want a user to type that.) Move 'commit -a' example into a literal code section, clarify that it finds modified files automatically. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:48:41 UTC |
| 2eff142 | Eric Wong | 07 January 2007, 01:53:40 UTC | Documentation/git-svn: clarify dcommit, rebase vs pull/merge Clarify that dcommit creates a revision in SVN for every commit in git. Also, add 'merge' to the rebase vs pull section because git-merge is now a first-class UI. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:48:21 UTC |
| 09c3a40 | Sasha Khapyorsky | 07 January 2007, 00:22:10 UTC | git-svnimport: clean svn path when accessing SVN repo Clean svn path from leading '/' when accessing SVN repo. Signed-off-by: Sasha Khapyorsky <sashak@voltaire.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:48:09 UTC |
| 40006ea | Sasha Khapyorsky | 07 January 2007, 00:17:19 UTC | git-svnimport: support for incremental import This adds ability to do import "in chunks" (default 1000 revisions), after each chunk git repo will be repacked. The option -R is used to change default value of chunk size (or how often repository will repacked). Signed-off-by: Sasha Khapyorsky <sashak@voltaire.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:47:58 UTC |
| 9fa77a5 | Alexandre Julliard | 06 January 2007, 13:46:47 UTC | git.el: Avoid setting font lock keywords before entering log-edit mode. Instead, reinitialize the keywords after the fact. This avoids conflicts with other users of log-edit mode, like pcl-cvs. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2007, 18:45:13 UTC |
| f281e3a | Fredrik Kuivinen | 06 January 2007, 10:40:06 UTC | instaweb: Nicer error message when the http daemon isn't found Signed-off-by: Fredrik Kuivinen <frekui@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2007, 18:44:59 UTC |
| cdc0873 | Alexandre Julliard | 06 January 2007, 10:20:57 UTC | git.el: Don't use --info-only when resolving a file. It doesn't make a difference for git.el, but it helps when interacting with git-rebase and friends. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2007, 18:44:51 UTC |
| e6d7b2f | Alexandre Julliard | 06 January 2007, 10:19:44 UTC | git-clean: Fix the -q option. The 'quiet' flag is set by -q, but it's not used anywhere. Remove it and set the 'echo1' variable instead. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2007, 18:44:40 UTC |
| f9e8a43 | Steven Grimm | 06 January 2007, 03:14:04 UTC | Print a more accurate error message when we fail to create a lock file. Signed-off-by: Steven Grimm <koreth@midwinter.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2007, 18:42:49 UTC |
| 1170e80 | Steven Grimm | 06 January 2007, 01:52:20 UTC | Describe git-clone's actual behavior in the summary If a branch other than "master" is checked out in the origin repository, git-clone makes a local copy of that branch rather than the origin's "master" branch. This patch describes the actual behavior. Signed-off-by: Steven Grimm <koreth@midwinter.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2007, 18:40:54 UTC |
| f08b3b0 | René Scharfe | 05 January 2007, 22:30:22 UTC | Set default "tar" umask to 002 and owner.group to root.root In order to make the generated tar files more friendly to users who extract them as root using GNU tar and its implied -p option, change the default umask to 002 and change the owner name and group name to root. This ensures that a) the extracted files and directories are not world-writable and b) that they belong to user and group root. Before they would have been assigned to a user and/or group named git if it existed. This also answers the question in the removed comment: uid=0, gid=0, uname=root, gname=root is exactly what we want. Normal users who let tar apply their umask while extracting are only affected if their umask allowed the world to change their files (e.g. a umask of zero). This case is so unlikely and strange that we don't need to support it. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2007, 18:37:14 UTC |
| 21afc41 | Junio C Hamano | 06 January 2007, 10:16:07 UTC | Fix timestamp for test-tick The earlier test timestamp was too old; I forgot that the bare unixtime integer had to be after Jan 1, 2000. This changes test_tick to use the git-epoch timestamp. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2007, 10:17:06 UTC |
| 16157b8 | Junio C Hamano | 05 January 2007, 21:31:43 UTC | builtin-prune: memory diet. Somehow we forgot to turn save_commit_buffer off while walking the reachable objects. Releasing the memory for commit object data that we do not use matters for large projects (for example, about 90MB is saved while traversing linux-2.6 history). Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 January 2007, 21:31:43 UTC |
| 244a70e | Luben Tuikov | 05 January 2007, 02:37:45 UTC | Blame "linenr" link jumps to previous state at "orig_lineno" Blame currently displays the commit id which introduced a block of one or more lines, the line numbers wrt the current listing of the file and the file's line contents. The commit id displayed is hyperlinked to the commit. Currently the linenr links are hyperlinked to the same commit id displayed to the left, which is _no_ different than the block of lines displayed, since it is the _same commit_ that is hyperlinked. And thus clicking on it leads to the same state of the file for that chunk of lines. I.e. data mining is not currently possible with gitweb given a chunk of lines introduced by a commit. This patch makes such data mining possible. The line numbers are now hyperlinked to the parent of the commit id of the block of lines. Furthermore they are linked to the line where that block was introduced. Thus clicking on a linenr link will show you the file's line(s) state prior to the commit id you were viewing. So clicking continually on a linenr link shows you how this line and its line number changed over time, leading to the initial commit where it was first introduced. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 January 2007, 07:20:43 UTC |
| 27dd1a8 | Jakub Narebski | 03 January 2007, 21:54:29 UTC | gitweb: Fix "Use of uninitialized value" warning in git_tags_body Fix "Use of uninitialized value" warning in git_tags_body generated for lightweight tags of tree and blob object; those don't have age ($tag{'age'}) defined. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 January 2007, 07:19:09 UTC |
| 2a3240b | Eric Wong | 05 January 2007, 02:09:56 UTC | git-svn: make --repack work consistently between fetch and multi-fetch Since fetch reforks itself at most every 1000 revisions, we need to update the counter in the parent process to have a working count if we set our repack interval to be > ~1000 revisions. multi-fetch has always done this correctly because of an extra process; now fetch uses the extra process; as well. While we're at it, only compile the $sha1 regex that checks for repacking once. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 January 2007, 06:28:46 UTC |
| 0d313b2 | Eric Wong | 05 January 2007, 02:04:06 UTC | git-svn: update documentation for multi-{init|fetch} Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 January 2007, 06:28:46 UTC |
| 98327e5 | Eric Wong | 05 January 2007, 02:02:00 UTC | git-svn: make multi-init less confusing It now requires at least one of the (trunk|branch|tags) arguments (either from the command-line or in .git/config). Also we make sure that anything that is passed as a URL ('help') in David's case is actually a URL. Thanks to David Kågedal for reporting this issue. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 January 2007, 06:28:46 UTC |
| 4fe2cc0 | René Scharfe | 04 January 2007, 18:33:36 UTC | Remove shadowing variable from traverse_trees() The variable named entry is allocated using malloc() and then forgotten, it being shadowed by an automatic variable of the same name. Fixing the array size at 3 worked so far because the only caller of traverse_trees() needed only as much entries. Simply remove the shadowing varaible and we're able to traverse more than three trees and save stack space at the same time! Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 January 2007, 06:28:46 UTC |
| 7c4c9f4 | René Scharfe | 04 January 2007, 18:33:48 UTC | Make check target depend on common-cmds.h This fixes sparse complaining about a missing include file if 'make check' is run on clean sources. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 January 2007, 06:28:46 UTC |
| 3a2d3e8 | Junio C Hamano | 04 January 2007, 08:06:50 UTC | rerere: Fix removal of already resolved path. There was an obvious thinko in memmove() to remove an entry that was resolved from the in-core data structure. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 January 2007, 06:28:46 UTC |
| e27e609 | Junio C Hamano | 05 January 2007, 06:28:21 UTC | Merge branch 'maint' * maint: pack-check.c::verify_packfile(): don't run SHA-1 update on huge data Fix infinite loop when deleting multiple packed refs. | 05 January 2007, 06:28:21 UTC |
| 8977c11 | Junio C Hamano | 04 January 2007, 07:09:08 UTC | pack-check.c::verify_packfile(): don't run SHA-1 update on huge data Running the SHA1_Update() on the whole packfile in a single call revealed an overflow problem we had in the SHA-1 implementation on POWER architecture some time ago, which was fixed with commit b47f509b (June 19, 2006). Other SHA-1 implementations may have a similar problem. The sliding mmap() series already makes chunked calls to SHA1_Update(), so this patch itself will become moot when it graduates to "master", but in the meantime, run the hash function in smaller chunks to prevent possible future problems. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 January 2007, 06:17:59 UTC |
| d222984 | Robert Fitzsimons | 03 January 2007, 20:25:55 UTC | gitweb: Fix shortlog only showing HEAD revision. My change in 190d7fdcf325bb444fa806f09ebbb403a4ae4ee6 had a small bug found by Michael Krufky which caused the passed in hash value to be ignored, so shortlog would only show the HEAD revision. Signed-off-by: Robert Fitzsimons <robfitz@273k.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 January 2007, 20:48:39 UTC |
| 60c0f84 | Junio C Hamano | 03 January 2007, 20:34:20 UTC | git-verify-tag: make sure we remove temporary file. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 January 2007, 20:34:20 UTC |
| 0bc72ab | Santi Béjar | 03 January 2007, 12:59:00 UTC | git-tag: add flag to verify a tag This way "git tag -v $tag" is the UI for git-verify-tag. Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 January 2007, 20:31:43 UTC |
| af0e4ac | Lars Hjemli | 03 January 2007, 20:10:09 UTC | Refactor print-functions in builtin-branch This moves the guts of print_ref_list() into a revamped print_ref_info(), which at the same time gets renamed to print_ref_item(). Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 January 2007, 20:19:20 UTC |
| 1ebb948 | Jakub Narebski | 03 January 2007, 19:47:25 UTC | gitweb: There can be empty patches (in git_patchset_body) We now do not skip over empty patches in git_patchset_body (where empty means that they consist only of git diff header, and of extended diff header), so uncomment branch of code dealing with empty patches (patches which do not have even two-line from/to header) Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 January 2007, 20:19:20 UTC |
| 6e72cf4 | Jakub Narebski | 03 January 2007, 19:47:24 UTC | gitweb: Fix bug in git_difftree_body (was '!=' instead of 'ne') Fix bug in git_difftree_body subroutine; it was used '!=' comparison operator for strings (file type) instead of correct 'ne'. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 January 2007, 20:19:20 UTC |
| 9c9410e | Santi Béjar | 03 January 2007, 12:53:27 UTC | Documentation/tutorial: misc updates - Teach how to delete a branch with "git branch -d name". - Usually a commit has one parent; merge has more. - Teach "git show" instead of "git cat-file -p". Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 January 2007, 20:19:20 UTC |
| c1d179f | Junio C Hamano | 03 January 2007, 16:38:01 UTC | tutorial: misc updates. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 January 2007, 16:38:01 UTC |
| f3a4740 | Lars Hjemli | 03 January 2007, 13:34:13 UTC | Skip excessive blank lines before commit body This modifies pretty_print_commit() to make the output of git-rev-list and friends a bit more predictable. A commit body starting with blank lines might be unheard-of, but still possible to create using git-commit-tree (so is bound to appear somewhere, sometime). Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 January 2007, 16:29:01 UTC |
| f367398 | Brian Gernhardt | 03 January 2007, 15:36:29 UTC | Add documentation for git-branch's color configuration. Added color.branch and color.branch.<slot> to configuration list. Style copied from color.status and meanings derived from the code. Moved the color meanings from color.diff.<slot> to color.branch.<slot> since the latter comes first alphabetically. Added --color and --no-color to git-branch's usage and documentation. Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 January 2007, 16:16:02 UTC |
| 956259e | Jakub Narebski | 03 January 2007, 15:03:01 UTC | gitweb: Fix error in git_project_index subroutine Instead of "$projectroot/$pr->{'path'}" to get the path to project GIT_DIR, it was used "$projectroot/$project" which is valid only for actions where project parameter is set, and 'project_index' is not one of them. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 January 2007, 16:14:46 UTC |
| 1084b84 | Junio C Hamano | 02 January 2007, 19:19:05 UTC | Fix infinite loop when deleting multiple packed refs. It was stupid to link the same element twice to lock_file_list and end up in a loop, so we certainly need a fix. But it is not like we are taking a lock on multiple files in this case. It is just that we leave the linked element on the list even after commit_lock_file() successfully removes the cruft. We cannot remove the list element in commit_lock_file(); if we are interrupted in the middle of list manipulation, the call to remove_lock_file_on_signal() will happen with a broken list structure pointed by lock_file_list, which would cause the cruft to remain, so not removing the list element is the right thing to do. Instead we should be reusing the element already on the list. There is already a code for that in lock_file() function in lockfile.c. The code checks lk->next and the element is linked only when it is not already on the list -- which is incorrect for the last element on the list (which has NULL in its next field), but if you read the check as "is this element already on the list?" it actually makes sense. We do not want to link it on the list again, nor we would want to set up signal/atexit over and over. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 January 2007, 09:22:35 UTC |
| 825cee7 | Andy Whitcroft | 02 January 2007, 14:12:09 UTC | send pack check for failure to send revisions list When passing the revisions list to pack-objects we do not check for errors nor short writes. Introduce a new write_in_full which will handle short writes and report errors to the caller. Use this to short cut the send on failure, allowing us to wait for and report the child in case the failure is its fault. Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 January 2007, 07:33:21 UTC |
| 44a167b | Eric Wong | 02 January 2007, 08:57:11 UTC | instaweb: load Apache mime and dir modules if they are needed I've noticed that Apache 2.2 on a Debian etch machine has these compiled as modules. Also set ServerName to avoid a warning at startup. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 January 2007, 07:25:42 UTC |
| 54b9e02 | Junio C Hamano | 02 January 2007, 19:22:08 UTC | fetch-pack: do not use lockfile structure on stack. They are used in atexit() for clean-up, and you will be accessing unallocated memory at that point. See 31f584c2 for the fix for a similar problem. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 January 2007, 19:22:08 UTC |
| 96a738c | Junio C Hamano | 02 January 2007, 07:42:53 UTC | Remove unused variable (git-commit.sh) Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 January 2007, 07:42:53 UTC |
| f4bf218 | Junio C Hamano | 01 January 2007, 23:08:06 UTC | Update clone/fetch documentation with --depth (shallow clone) option Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 January 2007, 23:08:06 UTC |
| a597fb0 | Junio C Hamano | 01 January 2007, 23:07:35 UTC | Strongly discourage --update-head-ok in fetch-options documentation. "Use it with care" is a wrong wording to say "this is purely internal and you are supposed to know what you are doing if you use this". Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 January 2007, 23:07:35 UTC |
| 9066f4e | Junio C Hamano | 01 January 2007, 22:40:37 UTC | Merge branch 'sp/merge' (early part) * 'sp/merge' (early part): Use merge-recursive in git-am -3. Allow merging bare trees in merge-recursive. Move better_branch_name above get_ref in merge-recursive. | 01 January 2007, 22:40:37 UTC |
| 6f0b4ac | J. Bruce Fields | 01 January 2007, 21:40:23 UTC | Documentation: remove master:origin example from pull-fetch-param.txt This is no longer a useful example. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 January 2007, 22:38:08 UTC |
| 33a59fd | J. Bruce Fields | 01 January 2007, 21:39:06 UTC | Documentation: update git-pull.txt for new clone behavior Update examples, stop using branch named "origin" as an example. Remove large example of use of remotes; that particular case is nicely automated by default, so it's not so pressing to explain, and we can refer to git-repo-config for the details. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 January 2007, 22:36:36 UTC |
| ac9c110 | Junio C Hamano | 01 January 2007, 20:24:15 UTC | git-fetch: remove .keep file at the end. Removal of them is needed regardless of errors. The original code had the removal outside of the process which sets the flag to tell the later step what to remove, but it runs as a downstream of a pipeline and its effect was lost. Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 January 2007, 22:36:01 UTC |
| d1014a1 | Junio C Hamano | 01 January 2007, 07:21:50 UTC | fail pull/merge early in the middle of conflicted merge After a pull that results in a conflicted merge, a new user often tries another "git pull" in desperation. When the index is unmerged, merge backends correctly bail out without touching either index nor the working tree, so this does not make the wound any worse. The user will however see several lines of messsages during this process, such as "filename: needs merge", "you need to resolve your current index first", "Merging...", and "Entry ... would be overwritten by merge. Cannot merge.". They are unnecessarily alarming, and cause useful conflict messages from the first pull scroll off the top of the terminal. This changes pull and merge to run "git-ls-files -u" upfront and stop them much earlier than we currently do. Old timers may know better and would not to try pulling again before cleaning things up; this change adds extra overhead that is unnecessary for them. But this would be worth paying for to save new people from needless confusion. Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 January 2007, 22:35:16 UTC |
| 9d0524d | Junio C Hamano | 01 January 2007, 20:07:26 UTC | Update send-pack pipeline documentation. The pipeline was much more complex and needed documentation, but now it is trivial and straightforward. Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 January 2007, 22:35:16 UTC |
| 4385355 | Eric Wong | 01 January 2007, 05:49:47 UTC | git-svn: t/t91??-*: optimize the tests a bit This removes some unnecessary 'svn up' calls throughout t9103-git-svn-graft-branches.sh: * removed an 'svn log' call that was leftover from debugging * removed multiple git-svn calls with a multi-init / multi-fetch combination (which weren't tested before, either) * replaced `rev-list ... | head -n1` with `rev-parse ...` (not sure what I was thinking when I wrote that) All this saves about 9 seconds from a test run (53s -> 44s for 'make t91*') on my 1.3GHz Athlon Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 January 2007, 07:40:52 UTC |
| 5bd3870 | Eric Wong | 01 January 2007, 05:49:46 UTC | git-svn: t/t9100-git-svn-basic: remove old check for NO_SYMLINK We don't support the svn command-line client anymore; nor do we support anything before SVN 1.1.0, so we can be certain symlinks will be supported in the SVN repository. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 January 2007, 07:40:52 UTC |
| c6d499a | Eric Wong | 01 January 2007, 05:49:45 UTC | git-svn: remove svnadmin dependency from the tests We require the libraries now, so we can create repositories using them (and save some executable load time while we're at it). Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 January 2007, 07:40:52 UTC |
| e90068a | Junio C Hamano | 01 January 2007, 02:18:23 UTC | i18n: do not leak 'encoding' header even when we cheat the conversion. We special case the case where encoding recorded in the commit and the output encoding are the same and do not call iconv(). But we should drop 'encoding' header for this case as well for consistency. Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 January 2007, 02:55:28 UTC |
| fbc9012 | Junio C Hamano | 01 January 2007, 01:44:37 UTC | Do not merge random set of refs out of wildcarded refs When your fetch configuration has only the wildcards, we would pick the lexicographically first ref from the remote side for merging, which was complete nonsense. Make sure nothing except the one that is specified with branch.*.merge is merged in this case. Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 January 2007, 02:53:26 UTC |
| 63c97ce | Theodore Tso | 31 December 2006, 04:11:52 UTC | Fix formatting for urls section of fetch, pull, and push manpages Updated to make the nroff'ed man pages look nicer. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 January 2007, 02:40:17 UTC |
| d66409f | J. Bruce Fields | 31 December 2006, 23:47:38 UTC | Documentation: update tutorial's discussion of origin Update tutorial's discussion of origin branch to reflect new defaults, and include a brief mention of git-repo-config. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 January 2007, 00:44:41 UTC |
| f65bb2c | J. Bruce Fields | 31 December 2006, 23:47:36 UTC | Documentation: update glossary entry for "origin" Update glossary entry for "origin" to reflect fact that it normally now refers to a remote repository, not a branch. Also, warning not to work on remote-tracking branches is no longer necessary since git doesn't allow that. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 January 2007, 00:37:20 UTC |
| 36566cc | J. Bruce Fields | 31 December 2006, 23:47:34 UTC | Documentation: update git-clone.txt for clone's new default behavior Fix a couple remaining references to the origin branch. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 January 2007, 00:16:10 UTC |
| c04197e | J. Bruce Fields | 31 December 2006, 23:47:33 UTC | Docs: update cvs-migration.txt to reflect clone's new default behavior I couldn't think of a really quick way to give all the details, so just refer readers to the git-repo-config man page instead. I haven't tested recent cvs import behavior--some time presumably it should be updated to do something more similar to clone. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 January 2007, 00:15:12 UTC |
| 0ae5f98 | Junio C Hamano | 31 December 2006, 09:26:53 UTC | send-pack: tell pack-objects to use its internal rev-list. This means one less process in the pipeline to worry about, and removes about 1/8 of the code. Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 December 2006, 09:26:53 UTC |
| 4b4ee90 | Junio C Hamano | 31 December 2006, 08:59:53 UTC | send-pack.c: use is_null_sha1() Everybody else uses is_null_sha1() -- there is no point to have its own is_zero_sha1() anymore. Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 December 2006, 08:59:53 UTC |
| 87a3d29 | Junio C Hamano | 31 December 2006, 08:52:25 UTC | Update documentation for update hook. Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 December 2006, 08:52:25 UTC |
| cc06c87 | Junio C Hamano | 31 December 2006, 08:31:26 UTC | Merge branch 'jc/send-pack-pipeline' * jc/send-pack-pipeline: Documentation: illustrate send-pack pipeline. send-pack: fix pipeline. | 31 December 2006, 08:31:26 UTC |
| 27086d0 | Shawn O. Pearce | 31 December 2006, 07:20:23 UTC | Add test case for update hooks in receive-pack. Verify that the update hooks work as documented/advertised. This is a simple set of tests to check that the update hooks run with the parameters expected, have their STDOUT and STDERR redirected to the client side of the connection, and that their STDIN does not contain any data (as its actually /dev/null). Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 December 2006, 08:21:37 UTC |
| a862f97 | Junio C Hamano | 31 December 2006, 06:39:24 UTC | Documentation/config.txt (and repo-config manpage): mark-up fix. Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 December 2006, 06:39:24 UTC |
| d77a64d | Shawn O. Pearce | 31 December 2006, 03:13:05 UTC | Teach Git how to parse standard power of 2 suffixes. Sometimes its necessary to supply a value as a power of two in a configuration parameter. In this case the user may want to use the standard suffixes such as K, M, or G to indicate that the numerical value should be multiplied by a constant base before being used. Shell scripts/etc. can also benefit from this automatic option parsing with `git repo-config --int`. [jc: with a couple of test and a slight input tightening] Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 December 2006, 06:22:14 UTC |
| 95d3c4f | Shawn O. Pearce | 31 December 2006, 02:55:22 UTC | Use /dev/null for update hook stdin. Currently the update hook invoked by receive-pack has its stdin connected to the pushing client. The hook shouldn't attempt to read from this stream, and doing so may consume data that was meant for receive-pack. Instead we should give the update hook /dev/null as its stdin, ensuring that it always receives EOF and doesn't disrupt the protocol if it attempts to read any data. The post-update hook is similar, as it gets invoked with /dev/null on stdin to prevent the hook from reading data from the client. Previously we had invoked it with stdout also connected to /dev/null, throwing away anything on stdout, to prevent client protocol errors. Instead we should redirect stdout to stderr, like we do with the update hook. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 December 2006, 06:22:14 UTC |
| cd83c74 | Shawn O. Pearce | 31 December 2006, 02:55:19 UTC | Redirect update hook stdout to stderr. If an update hook outputs to stdout then that output will be sent back over the wire to the push client as though it were part of the git protocol. This tends to cause protocol errors on the client end of the connection, as the hook output is not expected in that context. Most hook developers work around this by making sure their hook outputs everything to stderr. But hooks shouldn't need to perform such special behavior. Instead we can just dup stderr to stdout prior to invoking the update hook. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 December 2006, 06:22:14 UTC |
| 9b0b509 | Shawn O. Pearce | 31 December 2006, 02:55:15 UTC | Remove unnecessary argc parameter from run_command_v. The argc parameter is never used by the run_command_v family of functions. Instead they require that the passed argv[] be NULL terminated so they can rely on the operating system's execvp function to correctly pass the arguments to the new process. Making the caller pass the argc is just confusing, as the caller could be mislead into believing that the argc might take precendece over the argv, or that the argv does not need to be NULL terminated. So goodbye argc. Don't come back. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 December 2006, 06:22:14 UTC |
| ad1a382 | Shawn O. Pearce | 31 December 2006, 04:30:19 UTC | Automatically detect a bare git repository. Many users find it unfriendly that they can create a bare git repository easily with `git clone --bare` but are then unable to run simple commands like `git log` once they cd into that newly created bare repository. This occurs because we do not check to see if the current working directory is a git repository. Instead of failing out with "fatal: Not a git repository" we should try to automatically detect if the current working directory is a bare repository and use that for GIT_DIR, and fail out only if that doesn't appear to be true. We test the current working directory only after we have tried searching up the directory tree. This is to retain backwards compatibility with our previous behavior on the off chance that a user has a 'refs' and 'objects' subdirectories and a 'HEAD' file that looks like a symref, all stored within a repository's associated working directory. This change also consolidates the validation logic between the case of GIT_DIR being supplied and GIT_DIR not being supplied, cleaning up the code. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 December 2006, 06:22:13 UTC |
| 45b0979 | Shawn O. Pearce | 31 December 2006, 04:29:11 UTC | Replace "GIT_DIR" with GIT_DIR_ENVIRONMENT. We tend to use the nice constant GIT_DIR_ENVIRONMENT when we are referring to the "GIT_DIR" constant, but git.c didn't do so. Now it does. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 December 2006, 06:22:13 UTC |
| ef5ddb2 | Shawn O. Pearce | 31 December 2006, 04:28:53 UTC | Use PATH_MAX constant for --bare. For easier portability we prefer PATH_MAX over seemingly random constants like 1024. Make it so. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 December 2006, 06:22:13 UTC |
| c869753 | Shawn O. Pearce | 31 December 2006, 04:53:55 UTC | Force core.filemode to false on Cygwin. Many users have noticed that core.filemode doesn't appear to be automatically set right on Cygwin when using a repository stored on NTFS. The issue is that Cygwin and NTFS correctly supports the executable mode bit, and Git properly detected that, but most native Windows applications tend to create files such that Cygwin sees the executable bit set when it probably shouldn't be. This is especially bad if the user's favorite editor deletes the file then recreates it whenever they save (vs. just overwriting) as now a file that was created with mode 0644 by checkout-index appears to have mode 0755. So we introduce NO_TRUSTABLE_FILEMODE, settable at compile time. Setting this option forces core.filemode to false, even if the detection code would have returned true. This option should be enabled by default on Cygwin. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 December 2006, 06:21:31 UTC |
| 400e74d | Theodore Ts'o | 31 December 2006, 01:03:51 UTC | Fix formatting for urls section of fetch, pull, and push manpages The line: [remote "<remote>"] was getting swallowed up by asciidoc, causing a critical line in the explanation for how to store the .git/remotes information in .git/config to go missing from the git-fetch, git-pull, and git-push manpages. Put all of the examples into delimited blocks to fix this problem and to make them look nicer. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 December 2006, 02:19:19 UTC |
| 22b6abc | Johannes Schindelin | 31 December 2006, 01:07:41 UTC | Fix yet another subtle xdl_merge() bug In very obscure cases, a merge can hit an unexpected code path (where the original code went as far as saying that this was a bug). This failing merge was noticed by Alexandre Juillard. The problem is that the original file contains something like this: -- snip -- two non-empty lines before two empty lines after two empty lines -- snap -- and this snippet is reduced to _one_ empty line in _both_ new files. However, it is ambiguous as to which hunk takes the empty line: the first or the second one? Indeed in Alexandre's example files, the xdiff algorithm attributes the empty line to the first hunk in one case, and to the second hunk in the other case. (Trimming down the example files _changes_ that behaviour!) Thus, the call to xdl_merge_cmp_lines() has no chance to realize that the change is actually identical in both new files. Therefore, xdl_refine_conflicts() finds an empty diff script, which was not expected there, because (the original author of xdl_merge() thought) xdl_merge_cmp_lines() would catch that case earlier. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 December 2006, 02:05:05 UTC |
| 53af981 | Junio C Hamano | 30 December 2006, 23:49:32 UTC | i18n: drop "encoding" header in the output after re-coding. After re-coding the commit message into the encoding the user specified (either with core.logoutputencidng or --encoding option), this drops the "encoding" header altogether. The output is after re-coding as the user asked (either with the config or --encoding=<encoding> option), and the extra header becomes redundant information. Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 December 2006, 00:35:57 UTC |
| 677cfed | Junio C Hamano | 30 December 2006, 20:20:43 UTC | commit-tree: cope with different ways "utf-8" can be spelled. People can spell config.commitencoding differently from what we internally have ("utf-8") to mean UTF-8. Try to accept them and treat them equally. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 December 2006, 23:58:43 UTC |
| 7cbcf4d | Junio C Hamano | 30 December 2006, 19:59:08 UTC | Move commit reencoding parameter parsing to revision.c This way, git-rev-list and git-diff-tree with --pretty can use it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 December 2006, 23:58:32 UTC |
| 99e09cc | Junio C Hamano | 30 December 2006, 10:21:48 UTC | Documentation: minor rewording for git-log and git-show pages. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 December 2006, 10:36:13 UTC |
| 5dc7bcc | Junio C Hamano | 30 December 2006, 10:22:38 UTC | Documentation: i18n commit log message notes. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 December 2006, 10:36:08 UTC |
| 0007928 | Junio C Hamano | 30 December 2006, 10:35:14 UTC | t3900: test log --encoding=none Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 December 2006, 10:36:02 UTC |
| 4b46e22 | Junio C Hamano | 30 December 2006, 10:18:24 UTC | commit re-encoding: fix confusion between no and default conversion. Telling the git-log family not to do any character conversion is done with --encoding=none, which sets log_output_encoding to an empty string. However, logmsg_reencode() confused this with log_output_encoding and commit_encoding set to NULL. The latter means we should use the default encoding (i.e. utf-8). Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 December 2006, 10:18:24 UTC |
| b5ffa5c | Junio C Hamano | 29 December 2006, 20:14:30 UTC | Documentation: illustrate send-pack pipeline. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 December 2006, 20:14:30 UTC |
| e40a9e2 | Junio C Hamano | 29 December 2006, 10:35:40 UTC | send-pack: fix pipeline. send-pack builds a pipeline that runs "rev-list | pack-objects" and sends the output from pack-objects to the other side, while feeding the input side of that pipe from itself. However, the file descriptor that is given to this pipeline (so that it can be dup2(2)'ed into file descriptor 1 of pack-objects) is closed by the caller before the complex fork+exec dance! Worse yet, the caller already dup2's it to 1, so the child process did not even have to. I do not understand how this code could possibly have been working, but it somehow was working by accident. Merging the sliding mmap() code reveals this problem, presumably because it keeps one extra file descriptor open for a packfile and changes the way file descriptors are allocated. I am too tired to diagnose the problem now, but this seems to be a sensible fix. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 December 2006, 19:37:01 UTC |
| 1ed4813 | Junio C Hamano | 29 December 2006, 19:36:21 UTC | Merge branch 'jc/curl' * jc/curl: Work around http-fetch built with cURL 7.16.0 | 29 December 2006, 19:36:21 UTC |
| 4d06f8a | Junio C Hamano | 29 December 2006, 19:01:31 UTC | Fix 'git add' with .gitignore When '*.ig' is ignored, and you have two files f.ig and d.ig/foo in the working tree, $ git add . correctly ignored f.ig but failed to ignore d.ig/foo. This was caused by a thinko in an earlier commit 4888c534, when we tried to allow adding otherwise ignored files. After reverting that commit, this takes a much simpler approach. When we have an unmatched pathspec that talks about an existing pathname, we know it is an ignored path the user tried to add, so we include it in the set of paths directory walker returned. This does not let you say "git add -f D" on an ignored directory D and add everything under D. People can submit a patch to further allow it if they want to, but I think it is a saner behaviour to require explicit paths to be spelled out in such a case. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 December 2006, 19:01:31 UTC |
| c889763 | Junio C Hamano | 29 December 2006, 18:08:19 UTC | Revert "read_directory: show_both option." This reverts commit 4888c534099012d71d24051deb5b14319747bd1a. | 29 December 2006, 18:08:19 UTC |
| 8757749 | Jakub Narebski | 29 December 2006, 13:39:09 UTC | Add info about new test families (8 and 9) to t/README Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 December 2006, 17:49:12 UTC |
| 0450973 | Junio C Hamano | 29 December 2006, 10:25:04 UTC | t5400 send-pack test: try a bit more nontrivial transfer. Not that this reveals anything new, but I did test_tick shell function in test-lib and found it rather cute and nice. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 December 2006, 10:25:04 UTC |
| 579c9bb | Shawn O. Pearce | 28 December 2006, 07:35:27 UTC | Use merge-recursive in git-am -3. By switching from merge-resolve to merge-recursive in the 3-way fallback behavior of git-am we gain a few benefits: * renames are automatically handled, like in rebase -m; * conflict hunks can reference the patch name; * its faster on Cygwin (less forks). Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 December 2006, 03:06:16 UTC |
| a970e84 | Shawn O. Pearce | 28 December 2006, 07:35:24 UTC | Allow merging bare trees in merge-recursive. To support wider use cases, such as from within `git am -3`, the merge-recursive utility needs to accept not just commit-ish but also tree-ish as arguments on its command line. If given a tree-ish then merge-recursive will create a virtual commit wrapping it, with the subject of the commit set to the best name we can derive for that tree, which is either the command line string (probably the SHA1), or whatever string appears in GITHEAD_*. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 December 2006, 03:06:16 UTC |
| 7ba3c07 | Shawn O. Pearce | 28 December 2006, 07:35:20 UTC | Move better_branch_name above get_ref in merge-recursive. To permit the get_ref function to use the static better_branch_name function to generate a string on demand I'm moving it up earlier. The actual logic was not affected in this change. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 December 2006, 03:06:16 UTC |
| eff7375 | Junio C Hamano | 29 December 2006, 03:03:02 UTC | Merge branch 'jc/utf8' * jc/utf8: t3900: test conversion to non UTF-8 as well Rename t3900 test vector file UTF-8: introduce i18n.logoutputencoding. Teach log family --encoding i18n.logToUTF8: convert commit log message to UTF-8 Move encoding conversion routine out of mailinfo to utf8.c Conflicts: commit.c | 29 December 2006, 03:03:02 UTC |
| 013672b | Junio C Hamano | 29 December 2006, 00:32:17 UTC | Allow non-fast-forward of remote tracking branches in default clone This changes the default remote.origin.fetch configuration created by git-clone so that it allows non-fast-forward updates. When using the separate-remote layout with reflog enabled, it does not make much sense to refuse to update the remote tracking branch just because some of them do not fast-forward. git-fetch issues warnings on non-fast-forwardness, and the user can peek at what the previous state was using the reflog. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 December 2006, 02:37:33 UTC |
| e19b9dd | Junio C Hamano | 29 December 2006, 00:32:05 UTC | core.logallrefupdates: log remotes/ tracking branches. Not using reflog for tags/ was very sensible; not giving reflog for the remotes/ was not. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 December 2006, 02:37:33 UTC |
| 04ece59 | Junio C Hamano | 29 December 2006, 01:58:00 UTC | GIT_SKIP_TESTS: allow users to omit tests that are known to break In some environments, certain tests have no way of succeeding due to platform limitation, such as lack of 'unzip' program, or filesystem that do not allow arbitrary sequence of non-NUL bytes as pathnames. You should be able to say something like $ cd t $ GIT_SKIP_TESTS=t9200.8 t9200-git-cvsexport-commit.sh and even: $ GIT_SKIP_TESTS='t[0-4]??? t91?? t9200.8' make test to omit such tests. The value of the environment variable is a SP separated list of patterns that tells which tests to skip, and either can match the "t[0-9]{4}" part to skip the whole test, or t[0-9]{4} followed by ".$number" to say which particular test to skip. Note that some tests in the existing test suite rely on previous test item, so you cannot arbitrarily disable one and expect the remainder of test to check what the test originally was intended to check. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 December 2006, 02:00:22 UTC |
| 7255ff0 | Junio C Hamano | 29 December 2006, 01:36:35 UTC | t3900: test conversion to non UTF-8 as well Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 December 2006, 01:36:35 UTC |
| 3bd5c81 | Junio C Hamano | 29 December 2006, 00:43:27 UTC | Merge branch 'jc/make' * jc/make: gcc does not necessarily pass runtime libpath with -R | 29 December 2006, 00:43:27 UTC |
| b81ba57 | Jim Meyering | 28 December 2006, 15:05:02 UTC | update hook: redirect _both_ diagnostic lines to stderr upon tag failure Otherwise, sending the diagnostic to stdout would provoke a protocol failure. Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 December 2006, 22:12:48 UTC |
| 5d6b151 | Johannes Schindelin | 28 December 2006, 16:13:33 UTC | xdl_merge(): fix a segmentation fault when refining conflicts The function xdl_refine_conflicts() tries to break down huge conflicts by doing a diff on the conflicting regions. However, this does not make sense when one side is empty. Worse, when one side is not only empty, but after EOF, the code accessed unmapped memory. Noticed by Luben Tuikov, Shawn Pearce and Alexandre Julliard, the latter providing a test case. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 December 2006, 21:59:39 UTC |
