| a74e60a | Junio C Hamano | 12 November 2006, 02:22:31 UTC | GIT 1.4.4-rc2 Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2006, 02:30:31 UTC |
| dc8302d | Junio C Hamano | 12 November 2006, 02:30:31 UTC | Merge branch 'maint' * maint: git-cvsserver: read from git with -z to get non-ASCII pathnames. | 12 November 2006, 02:30:31 UTC |
| e02cd63 | Junio C Hamano | 10 November 2006, 19:53:41 UTC | git-cvsserver: read from git with -z to get non-ASCII pathnames. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2006, 02:26:57 UTC |
| 5a4ffc8 | Junio C Hamano | 11 November 2006, 22:49:25 UTC | Merge branch 'maint' * maint: path-list: fix path-list-insert return value | 11 November 2006, 22:49:25 UTC |
| 057bc80 | Junio C Hamano | 11 November 2006, 22:45:35 UTC | path-list: fix path-list-insert return value When path-list-insert is called on an existing path, it returned an unrelated element in the list. Luckily most of the callers are ignoring the return value, but merge-recursive uses it at three places and this would have resulted in a bogus rename detection. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 November 2006, 22:46:11 UTC |
| 8eaf798 | Junio C Hamano | 10 November 2006, 21:39:01 UTC | git-annotate: fix -S on graft file with comments. The graft file can contain comment lines and read_graft_line can return NULL for such an input, which should be skipped by the reader. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 November 2006, 21:44:39 UTC |
| a19f901 | Junio C Hamano | 10 November 2006, 21:36:44 UTC | git-annotate: no need to exec blame; it is built-in now. | 10 November 2006, 21:36:44 UTC |
| 368c2ac | Junio C Hamano | 09 November 2006, 23:08:19 UTC | Merge branch 'maint' * maint: git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch. git-svn: fix dcommit losing changes when out-of-date from svn git-svn: don't die on rebuild when --upgrade is specified git-svn: avoid printing filenames of files we're not tracking | 09 November 2006, 23:08:19 UTC |
| a6ec3c1 | Robert Shearman | 03 October 2006, 16:29:26 UTC | git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch. This reduces the number of conflicts when rebasing after a series of patches to the same piece of code is committed upstream. Signed-off-by: Robert Shearman <rob@codeweavers.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2006, 22:41:16 UTC |
| 18d5453 | Junio C Hamano | 09 November 2006, 18:44:56 UTC | Documentation: move blame examples This moves the example to specify a line range with regexps to a later part of the manual page that has similar examples. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2006, 18:44:56 UTC |
| 6a96b32 | Junio C Hamano | 09 November 2006, 17:40:59 UTC | Merge branch 'maint' * maint: Nicer error messages in case saving an object to db goes wrong | 09 November 2006, 17:40:59 UTC |
| 45bf473 | Eric Wong | 09 November 2006, 09:19:37 UTC | git-svn: fix dcommit losing changes when out-of-date from svn There was a bug in dcommit (and commit-diff) which caused deltas to be generated against the latest version of the changed file in a repository, and not the revision we are diffing (the tree) against locally. This bug can cause recent changes to the svn repository to be silently clobbered by git-svn if our repository is out-of-date. Thanks to Steven Grimm for noticing the bug. The (few) people using the commit-diff command are now required to use the -r/--revision argument. dcommit usage is unchanged. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2006, 17:34:46 UTC |
| a35a045 | Eric Wong | 05 November 2006, 05:51:11 UTC | git-svn: don't die on rebuild when --upgrade is specified --copy-remote and --upgrade are rarely (never?) used together, so if --copy-remote is specified, that means the user really wanted to copy the remote ref, and we should fail if that fails. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2006, 17:34:36 UTC |
| 75bd7e3 | Eric Wong | 05 November 2006, 05:51:10 UTC | git-svn: avoid printing filenames of files we're not tracking This is purely an aesthetic change, we already skip importing of files that don't affect the subdirectory we import. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2006, 17:34:27 UTC |
| 916d081 | Petr Baudis | 09 November 2006, 12:52:05 UTC | Nicer error messages in case saving an object to db goes wrong Currently the error e.g. when pushing to a read-only repository is quite confusing, this attempts to clean it up, unifies error reporting between various object writers and uses error() on couple more places. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2006, 17:33:53 UTC |
| 1c791cf | Junio C Hamano | 09 November 2006, 10:33:35 UTC | gitweb: fix unmatched div in commitdiff When the last filepair changed only metainfo we failed to close the extended header <div>. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2006, 10:33:35 UTC |
| 225932e | Junio C Hamano | 09 November 2006, 08:57:13 UTC | gitweb: protect commit messages from controls. The same change as the previous. It is rather sad that commit log message parser gives list of chomped lines while tag message parser gives unchomped ones. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2006, 08:57:13 UTC |
| 25ffbb2 | Junio C Hamano | 08 November 2006, 23:11:10 UTC | gitweb: protect blob and diff output lines from controls. This revealed that the output from blame and tag was not chomped properly and was relying on HTML output not noticing that extra whitespace that resulted from the newline, which was also fixed. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2006, 08:13:50 UTC |
| acca687 | Junio C Hamano | 09 November 2006, 02:47:54 UTC | git-pickaxe: retire pickaxe Just make it take over blame's place. Documentation and command have all stopped mentioning "git-pickaxe". The built-in synonym is left in the command table, so you can still say "git pickaxe", but it probably is a good idea to retire it as well. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2006, 02:49:37 UTC |
| 659db3f | Junio C Hamano | 08 November 2006, 21:43:08 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: [PATCH] gitk: Fix nextfile() and add prevfile() | 08 November 2006, 21:43:08 UTC |
| 3a94680 | Junio C Hamano | 08 November 2006, 21:20:46 UTC | git-status: quote LF in its output Otherwise, commit log template would get the remainder of the filename start on a new line unquoted and the log gets messed up. I initially considered using the full quote_c_style(), but the output from the command is primarily for human consumption so chose to leave other control characters and bytes with high-bits unmolested. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2006, 21:20:46 UTC |
| 2b2a8c7 | Junio C Hamano | 08 November 2006, 20:22:04 UTC | gitweb: do not give blame link unconditionally in diff-tree view Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2006, 20:34:25 UTC |
| 744d0ac | Jakub Narebski | 08 November 2006, 16:59:41 UTC | gitweb: New improved patchset view Replace "gitweb diff header" with its full sha1 of blobs and replace it by "git diff" header and extended diff header. Change also somewhat highlighting of diffs. Added `file_type_long' subroutine to convert file mode in octal to file type description (only for file modes which used by git). Changes: * "gitweb diff header" which looked for example like below: file:_<sha1 before>_ -> file:_<sha1 after>_ where 'file' is file type and '<sha1>' is full sha1 of blob is changed to diff --git _a/<file before>_ _b/<file after>_ In both cases links are visible and use default link style. If file is added, a/<file> is not hyperlinked. If file is deleted, b/<file> is not hyperlinked. * there is added "extended diff header", with <path> and <hash> hyperlinked (and <hash> shortened to 7 characters), and <mode> explained: '<mode>' is extended to '<mode> (<file type description>)', where added text is slightly lighter to easy distinguish that it was added (and it is difference from git-diff output). * from-file/to-file two-line header lines have slightly darker color than removed/added lines. * chunk header has now delicate line above for easier finding chunk boundary, and top margin of 2px, both barely visible. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2006, 20:34:19 UTC |
| 1d3bc0c | Jakub Narebski | 08 November 2006, 10:50:07 UTC | gitweb: Use character or octal escape codes (and add span.cntrl) in esc_path Instead of simply hiding control characters in esc_path by replacing them with '?', use Character Escape Codes (CEC) i.e. alphabetic backslash sequences like those found in C programming language and many other languages influenced by it, such as Java and Perl. If control characted doesn't have corresponding character escape code, use octal char sequence to escape it. Alternatively, controls can be replaced with Unicode Control Pictures U+2400 - U+243F (9216 - 9279), the Unicode characters reserved for representing control characters when it is necessary to print or display them. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2006, 20:34:03 UTC |
| 403d090 | Jakub Narebski | 08 November 2006, 10:48:56 UTC | gitweb: Better git-unquoting and gitweb-quoting of pathnames Extend unquote subroutine, which unquotes quoted and escaped filenames which git may return, to deal not only with octal char sequence quoting, but also quoting ordinary characters including '\"' and '\\' which are respectively quoted '"' and '\', and to deal also with C escape sequences including '\t' for TAB and '\n' for LF. Add esc_path subroutine for gitweb quoting and HTML escaping filenames (currently it does equivalent of ls' --hide-control-chars, which means showing undisplayable characters (including '\n' and '\t') as '?' (question mark) character, and use 'span' element with cntrl CSS class to help rendering them differently. Convert gitweb to use esc_path correctly to print pathnames. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2006, 18:38:48 UTC |
| 83ee94c | Junio C Hamano | 08 November 2006, 06:37:17 UTC | gitweb: minimally fix "fork" support. A forked project is defined to be $projname/$forkname.git for $projname.git; the code did not check this correctly and mistook $projname/.git to be a fork of itself. This minimally fixes the breakage. Also forks were not checked when index.aux file was in use. Listing the forked ones in index.aux would show them also on the toplevel index which may go against the hierarchical nature of forks, but again this is a minimal fix to whip it in a better shape suitable to be in the 'master' branch. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2006, 06:42:05 UTC |
| 5dd5ed0 | Junio C Hamano | 08 November 2006, 06:00:45 UTC | gitweb: fix disabling of "forks" Apparently this code was never tested without "forks". check-feature returns a one-element list (0) when disabled, and assigning that to a scalar variable made it to be called in a scalar context, which meant my $check_forks = gitweb_check_feature("forks") were always 1! Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2006, 06:00:45 UTC |
| baf0bfc | Junio C Hamano | 08 November 2006, 00:36:11 UTC | GIT 1.4.3-rc1 Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2006, 00:36:11 UTC |
| c56f243 | Junio C Hamano | 08 November 2006, 00:34:30 UTC | Merge branch 'maint' * maint: remove an unneeded test | 08 November 2006, 00:34:30 UTC |
| 24ad8e0 | Junio C Hamano | 08 November 2006, 00:33:59 UTC | Merge branch 'jc/pickaxe' | 08 November 2006, 00:33:59 UTC |
| 7bd9641 | Junio C Hamano | 08 November 2006, 00:20:02 UTC | git-pickaxe: allow "-L <something>,+N" With this, git pickaxe -L '/--progress/,+20' v1.4.0 -- pack-objects.c gives you 20 lines starting from the first occurrence of '--progress' in pack-objects, digging from v1.4.0 version. You can also say git pickaxe -L '/--progress/,-5' v1.4.0 -- pack-objects.c Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2006, 00:24:37 UTC |
| 231f240 | Nicolas Pitre | 07 November 2006, 15:51:23 UTC | git-pack-objects progress flag documentation and cleanup This adds documentation for --progress and --all-progress, remove a duplicate --progress handling and make usage string more readable. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2006, 00:05:37 UTC |
| 0623421 | Tero Roponen | 07 November 2006, 10:44:33 UTC | remove an unneeded test In wt-status.c there is a test which does nothing. This patch removes it. Signed-off-by: Tero Roponen <teanropo@jyu.fi> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 November 2006, 23:50:06 UTC |
| d0a75a1 | Junio C Hamano | 07 November 2006, 23:41:34 UTC | Merge branch 'jc/read-tree' * jc/read-tree: t6022: ignoring untracked files by merge-recursive when they do not matter merge-recursive: adjust to loosened "working file clobbered" check merge-recursive: make a few functions static. merge-recursive: use abbreviated commit object name. merge: loosen overcautious "working file will be lost" check. | 07 November 2006, 23:41:34 UTC |
| 66f3b35 | Junio C Hamano | 07 November 2006, 23:39:56 UTC | Merge branch 'np/index-pack' * np/index-pack: remove .keep pack lock files when done with refs update have index-pack create .keep file more carefully improve fetch-pack's handling of kept packs git-fetch can use both --thin and --keep with fetch-pack now Teach receive-pack how to keep pack files based on object count. Allow pack header preprocessing before unpack-objects/index-pack. Remove unused variable in receive-pack. Revert "send-pack --keep: do not explode into loose objects on the receiving end." missing small substitution Teach git-index-pack how to keep a pack file. Only repack active packs by skipping over kept packs. Allow short pack names to git-pack-objects --unpacked=. send-pack --keep: do not explode into loose objects on the receiving end. index-pack: minor fixes to comment and function name enhance clone and fetch -k experience mimic unpack-objects when --stdin is used with index-pack add progress status to index-pack make index-pack able to complete thin packs. enable index-pack streaming capability | 07 November 2006, 23:39:56 UTC |
| bd45fec | Junio C Hamano | 07 November 2006, 06:56:07 UTC | Merge branch 'maint' * maint: Documentation: Transplanting branch with git-rebase --onto merge-recursive implicitely depends on trust_executable_bit adjust_shared_perm: chmod() only when needed. Fix git-runstatus for repositories containing a file named HEAD | 07 November 2006, 06:56:07 UTC |
| 931233b | Junio C Hamano | 07 November 2006, 01:08:32 UTC | git-pickaxe: -L /regexp/,/regexp/ With this change, you can specify the beginning and the ending line of the range you wish to inspect with pattern matching. For example, these are equivalent with the git.git sources: git pickaxe -L 7,21 v1.4.0 -- commit.c git pickaxe -L '/^struct sort_node/,/^}/' v1.4.0 -- commit.c git pickaxe -L '7,/^}/' v1.4.0 -- commit.c git pickaxe -L '/^struct sort_node/,21' v1.4.0 -- commit.c Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 November 2006, 06:09:44 UTC |
| e52775f | Jakub Narebski | 06 November 2006, 18:12:45 UTC | Documentation: Transplanting branch with git-rebase --onto Added example of transplantig feature branch from one development branch (for example "next") into the other development branch (for example "master"). [jc: talking Carl's advice this contains both examples sent to the list by Jakub in his original message.] Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 November 2006, 23:01:14 UTC |
| d28f7cb | Junio C Hamano | 06 November 2006, 08:28:52 UTC | Document git-pack-refs and link it to git(7). Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 November 2006, 16:43:34 UTC |
| 9faed78 | Alex Riesen | 06 November 2006, 10:38:52 UTC | merge-recursive implicitely depends on trust_executable_bit Read the configuration in to get core.filemode value for this particular repository. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 November 2006, 16:42:02 UTC |
| fe732ed | Junio C Hamano | 04 November 2006, 20:24:05 UTC | adjust_shared_perm: chmod() only when needed. When widening permission for files and directories in a 'shared' repository for a user with inappropriate umask() setting for shared work, make sure we call chmod() only when we actually need to. The primary idea owes credit to Johannes. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 November 2006, 02:36:36 UTC |
| 49b8b29 | Jeff King | 05 November 2006, 22:22:15 UTC | Fix git-runstatus for repositories containing a file named HEAD The wt_status_print_updated() and wt_status_print_untracked() routines call setup_revisions() with 'HEAD' being the reference to the tip of the current branch. However, setup_revisions() gets confused if the branch also contains a file named 'HEAD' resulting in a fatal error. Instead, don't pass an argv to setup_revisions() at all; simply give it no arguments, and make 'HEAD' the default revision. Bug noticed by Rocco Rutte <pdmef@gmx.net>. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 November 2006, 02:35:08 UTC |
| a79c655 | Shawn O. Pearce | 05 November 2006, 11:25:25 UTC | Remove more sed invocations from within bash completion. This change removes between 1 and 4 sed invocations per completion entered by the user. In the case of cat-file the 4 invocations per completion can take a while on Cygwin; running these replacements directly within bash saves some time for the end user. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 21:36:38 UTC |
| e5d5b21 | Shawn O. Pearce | 05 November 2006, 11:24:56 UTC | Support bash completion on symmetric difference operator. Now that log, whatchanged, rev-list, etc. support the symmetric difference operator '...' we should provide bash completion for it just like we do for '..'. While we are at it we can remove two sed invocations during the interactive prompt and replace them with internal bash operations. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 21:36:36 UTC |
| 873537f | Shawn O. Pearce | 05 November 2006, 11:21:57 UTC | Take --git-dir into consideration during bash completion. If the user has setup a command line of "git --git-dir=baz" then anything we complete must be performed within the scope of "baz" and not the current working directory. This is useful with commands such as "git --git-dir=git.git log m" to complete out "master" and view the log for the master branch of the git.git repository. As a nice side effect this also works for aliases within the target repository, just as git would honor them. Unfortunately because we still examine arguments by absolute position in most of the more complex commands (e.g. git push) using --git-dir with those commands will probably still cause completion to fail. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 21:36:33 UTC |
| 56fc25f | Shawn O. Pearce | 05 November 2006, 11:21:03 UTC | Bash completion support for remotes in .git/config. Now that Git natively supports remote specifications within the config file such as: [remote "origin"] url = ... we should provide bash completion support "out of the box" for these remotes, just like we do for the .git/remotes directory. Also cleaned up the __git_aliases expansion to use the same form of querying and filtering repo-config as this saves two fork/execs in the middle of a user prompted completion. Finally also forced the variable 'word' to be local within __git_aliased_command. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 21:36:32 UTC |
| 76c3eb5 | Shawn O. Pearce | 05 November 2006, 11:20:25 UTC | Only load .exe suffix'd completions on Cygwin. The only platform which actually needs to define .exe suffixes as part of its completion set is Cygwin. So don't define them on any other platform. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 21:36:30 UTC |
| 144d33d | Shawn O. Pearce | 05 November 2006, 11:20:02 UTC | Added missing completions for show-branch and merge-base. The show-branch and merge-base commands were partially supported when it came to bash completions as they were only specified in one form another. Now we specify them in both forms. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 21:36:29 UTC |
| c2e525d | Junio C Hamano | 05 November 2006, 19:51:41 UTC | git-pickaxe: optimize by avoiding repeated read_sha1_file(). It turns out that pickaxe reads the same blob repeatedly while blame can reuse the blob already read for the parent when handling a child commit when it's parent's turn to pass its blame to the grandparent. Have a cache in the origin structure to keep the blob there, which will be garbage collected when the origin loses the last reference to it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 19:51:41 UTC |
| 2bc4547 | Junio C Hamano | 05 November 2006, 19:47:53 UTC | git-blame: add internal statistics to count read blobs. | 05 November 2006, 19:49:56 UTC |
| c74390e | Junio C Hamano | 05 November 2006, 19:26:21 UTC | cherry is built-in, do not ship git-cherry.sh Noticed by Rene; Makefile now has another maintainer's check target to catch this kind of mistakes. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 19:26:21 UTC |
| 82cc8d8 | Junio C Hamano | 05 November 2006, 07:52:32 UTC | Merge branch 'maint' * maint: Remove unsupported C99 style struct initializers in git-archive. Remove SIMPLE_PROGRAMS and make git-daemon a normal program. Use ULONG_MAX rather than implicit cast of -1. | 05 November 2006, 07:52:32 UTC |
| 6c2f207 | Shawn O. Pearce | 05 November 2006, 05:37:23 UTC | Remove unsupported C99 style struct initializers in git-archive. At least one older version of the Solaris C compiler doesn't support the newer C99 style struct initializers. To allow Git to compile on those systems use an archive description struct which is easier to initialize without the C99 struct initializer syntax. Also since the archives array is not used by anyone other than archive.c we can make it static. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 07:48:36 UTC |
| af8ffbe | Shawn O. Pearce | 05 November 2006, 07:28:25 UTC | Remove SIMPLE_PROGRAMS and make git-daemon a normal program. Some platforms (Solaris in particular) appear to require -lz as part of the link line for git-daemon, due to it linking against sha1_file.o and that module requiring inflate/deflate support. So its time to retire SIMPLE_PROGRAMS and move its last remaining member into the standard PROGRAMS list, allowing it to link against all libraries used by the rest of Git. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 07:41:05 UTC |
| bf8675d | Shawn O. Pearce | 05 November 2006, 07:27:07 UTC | Use ULONG_MAX rather than implicit cast of -1. At least one (older) version of the Solaris C compiler won't allow 'unsigned long x = -1' without explicitly casting -1 to a type of unsigned long. So instead use ULONG_MAX, which is really the correct constant anyway. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 07:41:02 UTC |
| b2e2ddf | Eric Wong | 05 November 2006, 05:51:11 UTC | git-svn: don't die on rebuild when --upgrade is specified --copy-remote and --upgrade are rarely (never?) used together, so if --copy-remote is specified, that means the user really wanted to copy the remote ref, and we should fail if that fails. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 07:33:21 UTC |
| 98526e0 | Eric Wong | 05 November 2006, 05:51:10 UTC | git-svn: avoid printing filenames of files we're not tracking This is purely an aesthetic change, we already skip importing of files that don't affect the subdirectory we import. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 07:33:13 UTC |
| 854b97f | Junio C Hamano | 05 November 2006, 03:18:50 UTC | git-pickaxe: fix origin refcounting When we introduced the cached origin per commit, we gave up proper garbage collecting because it meant that commits hold onto their cached copy. There is no need to do so. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 03:19:16 UTC |
| 94d5ca8 | Junio C Hamano | 05 November 2006, 01:22:14 UTC | Merge branch 'np/verbose-push' * np/verbose-push: make git-push a bit more verbose | 05 November 2006, 01:22:14 UTC |
| 66fd231 | Junio C Hamano | 05 November 2006, 01:18:29 UTC | Merge branch 'lt/push-config' * lt/push-config: git push: add verbose flag and allow overriding of default target repository Allow '-' in config variable names | 05 November 2006, 01:18:29 UTC |
| 67e78c3 | Shawn O. Pearce | 04 November 2006, 18:57:44 UTC | Added bash completion support for git-reset. Completion for the --hard/--soft/--mixed modes of operation as well as a ref name for <commit-ish> can be very useful and save some fingers. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 01:17:46 UTC |
| dfb9609 | Shawn O. Pearce | 04 November 2006, 18:57:18 UTC | Added completion support for git-branch.exe. On Cygwin a user might complete the new git-branch builtin as git-branch.exe, at which point bash requires a new completion registration for the command. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 01:17:45 UTC |
| 9004dcb | Junio C Hamano | 05 November 2006, 01:13:38 UTC | Merge branch 'pb/web' * pb/web: gitweb: Support for 'forks' | 05 November 2006, 01:13:38 UTC |
| 3349478 | Junio C Hamano | 05 November 2006, 00:39:03 UTC | git-pickaxe: re-scan the blob after making progress with -C The reason to do this is the same as in the previous change for line copy detection within the same file (-M). Also this fixes -C and -C -C (aka find-copies-harder) logic; in this application we are not interested in the similarity matching diffcore-rename makes, because we are only interested in scanning files that were modified, or in the case of -C -C, scanning all files in the parent and we want to do that ourselves. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 00:39:03 UTC |
| 650e2f6 | Junio C Hamano | 04 November 2006, 20:37:02 UTC | git-pickaxe: re-scan the blob after making progress with -M Otherwise we would miss copied lines that are contained in the parts before or after the part that we find after splitting the blame_entry (i.e. split[0] and split[2]). Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 November 2006, 20:37:02 UTC |
| 0421d9f | Junio C Hamano | 04 November 2006, 20:20:09 UTC | git-pickaxe: simplify Octopus merges further If more than one parents in an Octopus merge have the same origin, ignore later ones because it would not make any difference in the outcome. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 November 2006, 20:20:18 UTC |
| 2f3f8b2 | Junio C Hamano | 02 November 2006, 08:02:11 UTC | git-pickaxe: rename detection optimization The idea is that we are interested in renaming into only one path, so we do not care about renames that happen elsewhere. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 November 2006, 20:18:12 UTC |
| a622f6b | Junio C Hamano | 04 November 2006, 11:54:20 UTC | Merge branch 'maint' * maint: apply: handle "traditional" creation/deletion diff correctly. | 04 November 2006, 11:54:20 UTC |
| 6f9f3b2 | Junio C Hamano | 04 November 2006, 10:28:53 UTC | apply: handle "traditional" creation/deletion diff correctly. We deduced a GNU diff output that does not use /dev/null convention as creation (deletion) diff correctly by looking at the lack of context and deleted lines (added lines), but forgot to reset the new (old) name field properly. This was a regression when we added a workaround for --unified=0 insanity. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 November 2006, 10:35:17 UTC |
| 6768d6b | Aneesh Kumar K.V | 03 November 2006, 05:11:45 UTC | gitweb: Remove extra "/" in path names for git_get_project_list Without this change we get a wrong $pfxlen value and the check_export_ok() checks with with a wrong directory name. Without this patch the below $projects_list fails with gitweb $projects_list = "/tmp/a/b/"; Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 November 2006, 09:51:35 UTC |
| 2379d61 | Alexandre Julliard | 03 November 2006, 16:42:43 UTC | git.el: Include MERGE_MSG in the log-edit buffer even when not committing a merge. This lets us take advantage of the fact that git-cherry-pick now saves the message in MERGE_MSG too. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 November 2006, 09:50:35 UTC |
| 2ac2b19 | Alexandre Julliard | 03 November 2006, 16:42:17 UTC | git.el: Move point after the log message header when entering log-edit mode. Suggested by Han-Wen Nienhuys. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 November 2006, 09:50:26 UTC |
| b8ee518 | Alexandre Julliard | 03 November 2006, 16:41:46 UTC | git.el: Added a function to open the current file in another window. Bound to 'o' by default, compatible with pcl-cvs and buffer-mode. Suggested by Han-Wen Nienhuys. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 November 2006, 09:50:22 UTC |
| 8a078c3 | Alexandre Julliard | 03 November 2006, 16:41:23 UTC | git.el: Added functions for moving to the next/prev unmerged file. This is useful when doing a merge that changes many files with only a few conflicts here and there. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 November 2006, 09:50:13 UTC |
| 576162a | Nicolas Pitre | 01 November 2006, 22:06:25 UTC | remove .keep pack lock files when done with refs update This makes both git-fetch and git-push (fetch-pack and receive-pack) safe against a possible race with aparallel git-repack -a -d that could prune the new pack while it is not yet referenced, and remove the .keep file after refs have been updated. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2006, 08:24:07 UTC |
| 9ca4a20 | Nicolas Pitre | 01 November 2006, 22:06:24 UTC | have index-pack create .keep file more carefully If by chance we receive a pack which content (list of objects) matches another pack that we already have, and if that pack is marked with a .keep file, then we should not overwrite it. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2006, 08:24:07 UTC |
| da093d3 | Nicolas Pitre | 01 November 2006, 22:06:23 UTC | improve fetch-pack's handling of kept packs Since functions in fetch-clone.c were only used from fetch-pack.c, its content has been merged with fetch-pack.c. This allows for better coupling of features with much simpler implementations. One new thing is that the (abscence of) --thin also enforce it on index-pack now, such that index-pack will abort if a thin pack was _not_ asked for. The -k or --keep, when provided twice, now causes the fetched pack to be left as a kept pack just like receive-pack currently does. Eventually this will be used to close a race against concurrent repacking. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2006, 08:24:07 UTC |
| 920ccbf | Nicolas Pitre | 01 November 2006, 22:06:22 UTC | git-fetch can use both --thin and --keep with fetch-pack now Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2006, 08:24:07 UTC |
| fc04c41 | Shawn Pearce | 01 November 2006, 22:06:21 UTC | Teach receive-pack how to keep pack files based on object count. Since keeping a pushed pack or exploding it into loose objects should be a local repository decision this teaches receive-pack to decide if it should call unpack-objects or index-pack --stdin --fix-thin based on the setting of receive.unpackLimit and the number of objects contained in the received pack. If the number of objects (hdr_entries) in the received pack is below the value of receive.unpackLimit (which is 5000 by default) then we unpack-objects as we have in the past. If the hdr_entries >= receive.unpackLimit then we call index-pack and ask it to include our pid and hostname in the .keep file to make it easier to identify why a given pack has been kept in the repository. Currently this leaves every received pack as a kept pack. We really don't want that as received packs will tend to be small. Instead we want to delete the .keep file automatically after all refs have been updated. That is being left as room for future improvement. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2006, 08:24:07 UTC |
| bed006f | Nicolas Pitre | 01 November 2006, 22:06:20 UTC | Allow pack header preprocessing before unpack-objects/index-pack. Some applications which invoke unpack-objects or index-pack --stdin may want to examine the pack header to determine the number of objects contained in the pack and use that value to determine which executable to invoke to handle the rest of the pack stream. However if the caller consumes the pack header from the input stream then its no longer available for unpack-objects or index-pack --stdin, both of which need the version and object count to process the stream. This change introduces --pack_header=ver,cnt as a command line option that the caller can supply to indicate it has already consumed the pack header and what version and object count were found in that header. As this option is only meant for low level applications such as receive-pack we are not documenting it at this time. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2006, 08:24:07 UTC |
| 407e1d6 | Junio C Hamano | 03 November 2006, 08:23:52 UTC | Merge branch 'master' into np/index-pack * master: (90 commits) gitweb: Better support for non-CSS aware web browsers gitweb: Output also empty patches in "commitdiff" view gitweb: Use git-for-each-ref to generate list of heads and/or tags for-each-ref: "creator" and "creatordate" fields Add --global option to git-repo-config. pack-refs: Store the full name of the ref even when packing only tags. git-clone documentation didn't mention --origin as equivalent of -o Minor grammar fixes for git-diff-index.txt link_temp_to_file: call adjust_shared_perm() only when we created the directory Remove uneccessarily similar printf() from print_ref_list() in builtin-branch pack-objects doesn't create random pack names branch: work in subdirectories. gitweb: Use 's' regexp modifier to secure against filenames with LF gitweb: Secure against commit-ish/tree-ish with the same name as path gitweb: esc_html() author in blame git-svnimport: support for partial imports link_temp_to_file: don't leave the path truncated on adjust_shared_perm failure Move deny_non_fast_forwards handling completely into receive-pack. revision traversal: --unpacked does not limit commit list anymore. Continue traversal when rev-list --unpacked finds a packed commit. ... | 03 November 2006, 08:23:52 UTC |
| 6255ef0 | Jakub Narebski | 01 November 2006, 13:33:21 UTC | gitweb: Better support for non-CSS aware web browsers Add option to replace SPC (' ') with hard (non-breakable) space HTML entity ' ' in esc_html subroutine. Replace ' ' with ' ' for the code/diff display part in git_blob and git_patchset_body; this is to be able to view code and diffs in web browsers which doesn't understand "white-space: pre;" CSS declaration. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2006, 07:13:37 UTC |
| 241cc59 | Jakub Narebski | 31 October 2006, 16:36:27 UTC | gitweb: Output also empty patches in "commitdiff" view Remove skipping over empty patches (i.e. patches which consist solely of extended headers) in git_patchset_body, and add links to those header-only patches in git_difftree_body (but not generate blobdiff links when there were no change in file contents). Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2006, 07:11:31 UTC |
| aac91b7 | Junio C Hamano | 03 November 2006, 05:41:47 UTC | Merge branch 'sp/keep-pack' into np/index-pack * sp/keep-pack: (29 commits) Remove unused variable in receive-pack. Teach git-index-pack how to keep a pack file. Only repack active packs by skipping over kept packs. Allow short pack names to git-pack-objects --unpacked=. git-send-email: Read the default SMTP server from the GIT config file git-send-email: Document support for local sendmail instead of SMTP server Swap the porcelain and plumbing commands in the git man page Mention that pull can work locally in the synopsis gitweb: Add "next" link to commitdiff view gitweb: Move git_get_last_activity subroutine earlier Documentation: fix git-format-patch mark-up and link it from git.txt Documentation: Update information about <format> in git-for-each-ref Bash completion support for aliases gitweb: Fix up bogus $stylesheet declarations tests: merge-recursive is usable without Python gitweb: Check git base URLs before generating URL from it Documentation: add git in /etc/services. Documentation: add upload-archive service to git-daemon. git-cherry: document limit and add diagram diff-format.txt: Correct information about pathnames quoting in patch format ... | 03 November 2006, 05:41:47 UTC |
| c954d33 | Junio C Hamano | 03 November 2006, 02:05:33 UTC | Merge branch 'maint' * maint: git-clone documentation didn't mention --origin as equivalent of -o Minor grammar fixes for git-diff-index.txt link_temp_to_file: call adjust_shared_perm() only when we created the directory | 03 November 2006, 02:05:33 UTC |
| cd14640 | Jakub Narebski | 02 November 2006, 19:23:11 UTC | gitweb: Use git-for-each-ref to generate list of heads and/or tags Add two subroutines: git_get_heads_list and git_get_refs_list, which fill out needed parts of refs info (heads and tags respectively) info using single call to git-for-each-ref, instead of using git-peek-remote to get list of references and using parse_ref for each ref to get ref info, which in turn uses at least one call of git command. Replace call to git_get_refs_list in git_summary by call to git_get_references, git_get_heads_list and git_get_tags_list (simplifying this subroutine a bit). Use git_get_heads_list in git_heads and git_get_tags_list in git_tags. Modify git_tags_body slightly to accept output from git_get_tags_list. Remove no longer used, and a bit hackish, git_get_refs_list. parse_ref is no longer used, but is left for now. Generating "summary" and "tags" views should be much faster for projects which have large number of tags. CHANGES IN OUTPUT: Before, if ref in refs/tags was tag pointing to commit we used committer epoch as epoch for ref, and used tagger epoch as epoch only for tag pointing to object of other type. If ref in refs/tags was commit, we used committer epoch as epoch for ref (see parse_ref; we sorted in gitweb by 'epoch' field). Currently we use committer epoch for refs pointing to commit objects, and tagger epoch for refs pointing to tag object, even if tag points to commit. Simple ab benchmark before and after this patch for my git.git repository (git/jnareb-git.git) with some heads and tags added as compared to git.git repository, shows around 2.4-3.0 times speedup for "summary" and "tags" views: summary 3134 +/- 24.2 ms --> 1081 +/- 30.2 ms tags 2886 +/- 18.9 ms --> 1196 +/- 15.6 ms Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2006, 02:04:40 UTC |
| 3175aa1 | Junio C Hamano | 28 October 2006, 20:33:46 UTC | for-each-ref: "creator" and "creatordate" fields This adds "creator" (which is parallel to "tagger" or "committer") and "creatordate" (corresponds to "taggerdate" and "committerdate"). As other "date" fields, "creatordate" sorts numerically and displays human readably. This allows for example for sorting together heavyweigth and lightweight tags. Signed-off-by: Junio C Hamano <junkio@cox.net> Acked-by: Jakub Narebski <jnareb@gmail.com> | 03 November 2006, 02:04:40 UTC |
| 34eb334 | Sean | 02 November 2006, 15:44:20 UTC | Add --global option to git-repo-config. Allow user to set variables in global ~/.gitconfig file using command line. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2006, 02:04:40 UTC |
| ca8e2d8 | Alexandre Julliard | 02 November 2006, 11:13:32 UTC | pack-refs: Store the full name of the ref even when packing only tags. Using for_each_tag_ref() to enumerate tags is wrong since it removes the refs/tags/ prefix, we need to always use for_each_ref() and filter out non-tag references in the callback. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2006, 02:04:40 UTC |
| ba158a3 | Andy Parkins | 02 November 2006, 11:11:56 UTC | git-clone documentation didn't mention --origin as equivalent of -o Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2006, 02:03:47 UTC |
| 44b27ec | Andy Parkins | 02 November 2006, 11:12:44 UTC | Minor grammar fixes for git-diff-index.txt "what you are going to commit is" doesn't need the "is" and does need a comma. "can trivially see" is an unecessary split infinitive and "easily" is a more appropriate adverb. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2006, 02:03:31 UTC |
| 866cae0 | Johannes Schindelin | 03 November 2006, 02:02:17 UTC | link_temp_to_file: call adjust_shared_perm() only when we created the directory | 03 November 2006, 02:02:17 UTC |
| 5c1e235 | Andy Parkins | 02 November 2006, 11:10:52 UTC | Remove uneccessarily similar printf() from print_ref_list() in builtin-branch Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2006, 01:39:58 UTC |
| 20239ba | Jeff King | 02 November 2006, 07:22:49 UTC | git-pickaxe: work properly in a subdirectory. We forgot to add prefix to the given path. [jc: interestingly enough, Jeff King had the same idea after I pushed mine out to "pu", and his patch was cleaner, so I dropped mine.] Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 November 2006, 08:11:30 UTC |
| fa438a2 | Nicolas Pitre | 31 October 2006, 21:58:32 UTC | make git-push a bit more verbose Currently git-push displays progress status for the local packing of objects to send, but nothing once it starts to push it over the connection. Having progress status in that later case is especially nice when pushing lots of objects over a slow network link. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 November 2006, 23:13:10 UTC |
| 7854e52 | Junio C Hamano | 01 November 2006, 23:09:55 UTC | Merge branch 'maint' * maint: pack-objects doesn't create random pack names link_temp_to_file: don't leave the path truncated on adjust_shared_perm failure | 01 November 2006, 23:09:55 UTC |
| e23ed9a | Nicolas Pitre | 01 November 2006, 22:34:47 UTC | pack-objects doesn't create random pack names Documentation for pack-objects seems to be out of date in this regard. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 November 2006, 23:09:39 UTC |
| 1da1b3a | Junio C Hamano | 01 November 2006, 20:53:13 UTC | branch: work in subdirectories. Noticed by Andy Whitcroft Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 November 2006, 20:53:13 UTC |
| 8b4b94c | Jakub Narebski | 30 October 2006, 21:25:11 UTC | gitweb: Use 's' regexp modifier to secure against filenames with LF Use 's' (treat string as single line) regexp modifier in git_get_hash_by_path (against future changes, probably unnecessary) and in parse_ls_tree_line (when called with '-z'=>1 option) to secure against filenames containing newline. [jc: the hunk on git_get_hash_by_path was unneeded, and I noticed the regexp was doing unnecessary capture, so fixed it up while I was at it.] Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 November 2006, 20:26:29 UTC |
| 45bd0c8 | Jakub Narebski | 30 October 2006, 21:29:06 UTC | gitweb: Secure against commit-ish/tree-ish with the same name as path Add "--" after <commit-ish> or <tree-ish> argument to clearly mark it as <commit-ish> or <tree-ish> and not pathspec, securing against refs with the same names as files or directories in [live] repository. Some wrapping to reduce line length as well. [jc: with "oops, ls-tree does not want --" fix-up manually applied.] Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 November 2006, 20:15:39 UTC |
