| b9718d4 | Junio C Hamano | 17 July 2006, 08:08:11 UTC | Merge branch 'sp/reflog' * sp/reflog: Record rebase changes as 'rebase' in the reflog. Log ref changes made by resolve. Log ref changes made by quiltimport. Log ref changes made by git-merge and git-pull. | 17 July 2006, 08:08:11 UTC |
| 7b520e6 | Eric Wong | 15 July 2006, 14:10:56 UTC | git-svn: don't check for migrations/upgrades on commit-diff Unlike other git-svn commands, commit-diff is intended to operate without needing any additional metadata inside .git Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 July 2006, 20:46:47 UTC |
| 26a8ad2 | Junio C Hamano | 16 July 2006, 07:00:09 UTC | show-branch: fix performance problem. The core function used in show-branch, join_revs(), was supposed to be exactly the same algorithm as merge_bases(), except that it was a version enhanced for use with more than two heads. However, it needed to mark and keep a list of all the commits it has seen, because it needed them for its semi-graphical output. The function to implement this list, mark_seen(), stupidly used insert_by_date(), when it did not need to keep the list sorted during its processing. This made "show-branch --merge-base" more than 20x slower compared to "merge-base --all" in some cases (e.g. between b5032a5 and 48ce8b0 in the Linux 2.6 kernel archive). The performance of "show-branch --independent" suffered from the same reason. This patch sorts the resulting list after the list traversal just once to fix these problems. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 July 2006, 07:00:09 UTC |
| a3e65d7 | Jonas Fonseca | 14 July 2006, 23:36:00 UTC | Documentation/urls.txt: Use substitution to escape square brackets This changes "[user@]" to use {startsb} and {endsb} to insert [ and ], similar to how {caret} is used in git-rev-parse.txt. [jc: Removed a well-intentioned comment that broke the final formatting from the original patch. While we are at it, updated the paragraph that claims to be equivalent to the section that was updated earlier without making matching changes.] Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 July 2006, 23:36:00 UTC |
| c7543ce | Junio C Hamano | 14 July 2006, 23:32:38 UTC | Documentation/Makefile: product depends on asciidoc.conf Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 July 2006, 23:32:38 UTC |
| 5cd060b | Junio C Hamano | 14 July 2006, 22:39:19 UTC | Merge branch 'lt/unitype' * lt/unitype: builtin-prune.c: forgot TYPE => OBJ changes. Remove TYPE_* constant macros and use object_type enums consistently. | 14 July 2006, 22:39:19 UTC |
| 1733832 | Junio C Hamano | 14 July 2006, 22:38:37 UTC | Merge branch 'sp/lazy-mkdir' * sp/lazy-mkdir: Make lazy mkdir more robust. | 14 July 2006, 22:38:37 UTC |
| 7eae7b9 | Sergey Vlasov | 14 July 2006, 15:06:57 UTC | Fix "git-fetch --tags" exit status when nothing has been changed After commit 55b7835e1b81a6debc7648149d2b8a4c5c64ddba git-fetch --tags exits with status 1 when no tags have been changed, which breaks calling git-fetch from scripts. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 July 2006, 18:33:14 UTC |
| d5b9e6c | Matthias Lederhofer | 14 July 2006, 16:37:06 UTC | argv created by handle_alias should be NULL terminated Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 July 2006, 18:32:39 UTC |
| dd4c591 | Alp Toker | 14 July 2006, 18:31:50 UTC | documentation (urls.txt) typofix | 14 July 2006, 18:31:50 UTC |
| e5a78b1 | Junio C Hamano | 14 July 2006, 06:37:52 UTC | builtin-prune.c: forgot TYPE => OBJ changes. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 July 2006, 06:37:52 UTC |
| 8ef1c7c | Shawn Pearce | 14 July 2006, 04:47:23 UTC | Record rebase changes as 'rebase' in the reflog. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 July 2006, 06:08:24 UTC |
| 4b7ce6e | Luben Tuikov | 13 July 2006, 19:36:22 UTC | gitweb.css: Use monospace fonts for commits and tree-diff. Use monospace fonts for the commit header, commit message, and tree-diff. This helps viewing commit logs with ASCII art. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 July 2006, 05:02:43 UTC |
| 3dffd2c | Alex Riesen | 13 July 2006, 08:30:43 UTC | Do not use perl in git-commit.sh git-commit.sh has the only one place where perl is used and there it can quite trivially be done in sh. git-ls-files without "-z" produces quoted output, even if is different from that produced by perl code it is good enough. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 July 2006, 05:00:16 UTC |
| f5b571f | Timo Hirvonen | 13 July 2006, 16:08:06 UTC | diff: Support 256 colors Add support for more than 8 colors. Colors can be specified as numbers -1..255. -1 is same as "normal". Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 July 2006, 04:53:25 UTC |
| f37399e | Timo Hirvonen | 13 July 2006, 16:06:12 UTC | diff: Support both attributes and colors Make it possible to set both colors and a attribute for diff colors. Background colors are supported too. Syntax is now: [attr] [fg [bg]] [fg [bg]] [attr] Empty value is same as "normal normal", ie use default colors. The new syntax is backwards compatible. Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 July 2006, 04:53:23 UTC |
| ff4d780 | Matthias Lederhofer | 12 July 2006, 19:54:51 UTC | Documentation about exclude/ignore files Use .git/info/exclude in the example in git-ls-files.txt, instead of .git/ignore, and update the list of commands looking at .git/info/exclude in repository-layout.txt. Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 July 2006, 04:52:42 UTC |
| a526276 | Matthias Lederhofer | 13 July 2006, 16:47:13 UTC | daemon: new option --detach to run git-daemon in background Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 July 2006, 04:50:46 UTC |
| 45ed5d7 | Matthias Lederhofer | 13 July 2006, 10:18:08 UTC | daemon: new option --pid-file=<path> to store the pid Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 July 2006, 04:50:41 UTC |
| 5f490ce | Matthias Lederhofer | 13 July 2006, 11:07:59 UTC | upload-pack: ignore write errors to stderr Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 July 2006, 04:50:22 UTC |
| 258e93a | Matthias Lederhofer | 13 July 2006, 16:32:11 UTC | daemon: if one of the standard fds is missing open it to /dev/null Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 July 2006, 04:50:20 UTC |
| ad8b4f5 | Matthias Lederhofer | 13 July 2006, 10:02:29 UTC | daemon: use a custom die routine with syslog Removed the git-daemon prefix from die() because no other call to die does this. Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 July 2006, 04:50:14 UTC |
| 8d5e268 | Junio C Hamano | 14 July 2006, 04:48:45 UTC | Documentation: Fix ssh://[user@]host.xz URL Earlier commit c3f17061 broke asciidoc markup. Noticed by Alp Toker with a fix, but fixed up in a way with smaller formatting impact. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 July 2006, 04:48:45 UTC |
| 8554092 | Junio C Hamano | 14 July 2006, 04:39:13 UTC | Adjust t4013 tests to corrected format-patch. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 July 2006, 04:40:44 UTC |
| 19b3bd3 | Robert Shearman | 13 July 2006, 22:17:22 UTC | format-patch: Generate a newline between the subject header and the message body format-patch previously didn't generate a newline after a subject. This caused the diffstat to not be displayed in messages with only one line for the commit message. This patch fixes this by adding a newline after the headers if a body hasn't been added. Signed-off-by: Robert Shearman <rob@codeweavers.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 July 2006, 04:40:43 UTC |
| a40d384 | Junio C Hamano | 14 July 2006, 02:51:12 UTC | t4013 diff format tests update This changes one test commit in the sequence to have more than one lines of commit log. A few output formats (--pretty=email aka format-patch and --pretty=oneline) need to behave differently on single and multi-line log, and this change will help catching breakages. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 July 2006, 04:40:43 UTC |
| 5716e79 | Jakub Narebski | 13 July 2006, 20:22:14 UTC | Display help for Git mode after pressing `h' or `?' in *git-status* Add bindings for "h" and "?" in git-status-mode to display help about the mode, including keymap via (describe-function 'git-status-mode), like in PCL-CVS. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 July 2006, 04:21:34 UTC |
| 1b3a667 | Jakub Narebski | 13 July 2006, 20:22:13 UTC | Wrap long lines in docstrings in contrib/emacs/git.el Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 July 2006, 04:21:27 UTC |
| 1974632 | Linus Torvalds | 12 July 2006, 03:45:31 UTC | Remove TYPE_* constant macros and use object_type enums consistently. This updates the type-enumeration constants introduced to reduce the memory footprint of "struct object" to match the type bits already used in the packfile format, by removing the former (i.e. TYPE_* constant macros) and using the latter (i.e. enum object_type) throughout the code for consistency. Eventually we can stop passing around the "type strings" entirely, and this will help - no confusion about two different integer enumeration. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 July 2006, 06:18:03 UTC |
| 756aaf4 | Shawn Pearce | 12 July 2006, 05:00:16 UTC | Make lazy mkdir more robust. Linus Torvalds <torvalds@osdl.org> wrote: It's entirely possible that we should just make that whole if (ret == ENOENT) go away. Yes, it's the right error code if a subdirectory is missing, and yes, POSIX requires it, and yes, WXP is probably just a horrible piece of sh*t, but on the other hand, I don't think git really has any serious reason to even care. | 13 July 2006, 06:16:29 UTC |
| d3ba675 | Junio C Hamano | 13 July 2006, 06:09:10 UTC | Merge branch 'ml/trace' * ml/trace: test-lib: unset GIT_TRACE GIT_TRACE: fix a mixed declarations and code warning GIT_TRACE: show which built-in/external commands are executed | 13 July 2006, 06:09:10 UTC |
| 1d0361e | Junio C Hamano | 13 July 2006, 06:09:00 UTC | test-lib: unset GIT_TRACE Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 July 2006, 06:09:00 UTC |
| a72f937 | Junio C Hamano | 13 July 2006, 06:00:46 UTC | git-repack: avoid redirecting stderr into git-pack-objects We are trying to catch error condition of git-rev-list and cause the downstream pack-objects to barf, but if you run rev-list with anything that mucks with its stderr (such as GIT_TRACE), any stderr output would cause the pipeline to fail. [jc: originally from Matthias Lederhofer, with a reworded error message.] Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 July 2006, 06:00:46 UTC |
| 869659a | Junio C Hamano | 13 July 2006, 05:51:25 UTC | Fix grammatical error in git-revert We always talk about "commit xyz". We never talk about "xyz commit", except when we end up talking about a commit as a branch head (notably, I would say "the HEAD commit", or possibly "the top-of-master commit", but here $commit is a SHA1 name, not anything else). Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 July 2006, 05:51:25 UTC |
| e40e013 | Junio C Hamano | 13 July 2006, 05:44:59 UTC | Merge branch 'js/merge-base' * js/merge-base: Additional merge-base tests (revised) merge-base: update the clean-up postprocessing | 13 July 2006, 05:44:59 UTC |
| 3939b80 | Junio C Hamano | 13 July 2006, 05:31:55 UTC | Merge branch 'lt/prune' * lt/prune: builtin "git prune" | 13 July 2006, 05:31:55 UTC |
| 096b173 | Junio C Hamano | 13 July 2006, 05:31:22 UTC | Merge branch 'lt/merge-tree' * lt/merge-tree: Improved three-way blob merging code Prepare "git-merge-tree" for future work xdiff: generate "anti-diffs" aka what is common to two files | 13 July 2006, 05:31:22 UTC |
| e918c6a | Junio C Hamano | 13 July 2006, 05:21:05 UTC | fmt-merge-msg fix The new C version mistranslated the original Perl version in the case to pull from the HEAD. This made it to say nonsense like this: Merge commit ...url... of HEAD * HEAD: ... Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 July 2006, 05:21:47 UTC |
| e130dda | Alp Toker | 12 July 2006, 22:55:10 UTC | gitweb: Make command invocations go through the git wrapper This patch makes invocations of core git commands go through the 'git' binary itself, which improves readability and might help system administrators lock down their CGI environment for security. Signed-off-by: Alp Toker <alp@atoker.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 July 2006, 05:00:22 UTC |
| 49da1da | Alp Toker | 11 July 2006, 20:10:26 UTC | gitweb: Include a site name in page titles This helps users tell one 'git' bookmark apart from the other in their browser and improves the indexing of gitweb sites in Web search engines. The title defaults to the SERVER_NAME environment variable, often given by the webserver. Signed-off-by: Alp Toker <alp@atoker.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 July 2006, 21:18:42 UTC |
| f6801d6 | Alp Toker | 11 July 2006, 10:19:34 UTC | gitweb: Send XHTML as 'application/xhtml+xml' where possible "The 'text/html' media type [RFC2854] is primarily for HTML, not for XHTML. In general, this media type is NOT suitable for XHTML." This patch makes gitweb use content negotiation to conservatively send pages as Content-Type 'application/xhtml+xml' when the user agent explicitly claims to support it. It falls back to 'text/html' even if the user agent appears to implicitly support 'application/xhtml+xml' due to a '*/*' glob, working around an insidious bug in Internet Explorer where sending the correct media type prevents the page from being displayed. Signed-off-by: Alp Toker <alp@atoker.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 July 2006, 21:18:42 UTC |
| 5a6852f | Shawn Pearce | 11 July 2006, 06:25:09 UTC | Log ref changes made by resolve. Since git-resolve is essentially a form of git-merge record any ref updates it makes similiar to how git-merge would record them. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 July 2006, 21:16:53 UTC |
| 09a28ec | Shawn Pearce | 11 July 2006, 06:10:19 UTC | Log ref changes made by quiltimport. When importing a quilt patch to a branch which has a reflog record the update to HEAD with a log message indicating the change was made by quiltimport and what patch caused the change. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 July 2006, 21:16:53 UTC |
| e1447e3 | Shawn Pearce | 11 July 2006, 05:52:54 UTC | Log ref changes made by git-merge and git-pull. When git-merge updates HEAD as a result of a merge record what happened during the merge into the reflog associated with HEAD (if any). The log reports who caused the update (git-merge or git-pull, by invoking git-merge), what the remote ref names were and the type of merge process used. The merge information can be useful when reviewing a reflog for a branch such as `master` where fast forward and trivial in index merges might be common as the user tracks an upstream. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 July 2006, 21:16:53 UTC |
| ed0e078 | Eric Wong | 11 July 2006, 21:06:39 UTC | git-fetch: fix a bashism (==) Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 July 2006, 21:14:09 UTC |
| 38d3874 | Linus Torvalds | 11 July 2006, 17:10:29 UTC | Make the unpacked object header functions static to sha1_file.c Nobody else uses them, and I'm going to start changing them. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 July 2006, 19:58:53 UTC |
| d2216f2 | Alp Toker | 11 July 2006, 10:19:37 UTC | git-send-email: Remove redundant Reply-To header There is no sense in duplicating the sender address in Reply-To as it's already provided in the From header. Signed-off-by: Alp Toker <alp@atoker.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 July 2006, 19:48:18 UTC |
| 2a75848 | Alp Toker | 11 July 2006, 10:19:33 UTC | typofix (git-name-rev documentation) Signed-off-by: Alp Toker <alp@atoker.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 July 2006, 19:45:20 UTC |
| c3f1706 | Yakov Lerner | 11 July 2006, 21:02:00 UTC | Mention the [user@] part in documentation of ssh:// urls. Signed-off-by: Yakov Lerner <iler.ml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 July 2006, 19:39:09 UTC |
| 8ff99e7 | Eric Wong | 11 July 2006, 19:01:54 UTC | tests: Set EDITOR=: and VISUAL=: globally This way we don't have to remember to set it for each test; and if we forget, we won't cause interactive editors to be spawned for non-interactive tests. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 July 2006, 19:32:54 UTC |
| 55b7835 | Shawn Pearce | 11 July 2006, 03:38:35 UTC | Log ref changes made by git-fetch and git-pull. When git-fetch updates a reference record in the associated reflog what type of update took place and who caused it (git-fetch or git-pull, by invoking git-fetch). Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 July 2006, 04:21:27 UTC |
| a3a733e | Shawn Pearce | 11 July 2006, 02:48:47 UTC | Record the type of commit operation in the reflog. If committing a merge (.git/MERGE_HEAD exists), an initial tree (no HEAD) or using --amend to amend the prior commit then denote the subtype of commit in the reflog. This helps to distinguish amended or merge commits from normal commits. In the case of --amend the prior sha1 is probably the commit which is being thrown away in favor of the new commit. Since it is likely that the old commit doesn't have any ref pointing to it anymore it can be interesting to know why that the commit was replaced and orphaned. In the case of a merge the prior sha1 is probably the first parent of the new merge commit. Consequently having its prior sha1 in the reflog is slightly less interesting but its still informative to know the commit was the result of a merge which had to be completed by hand. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 July 2006, 04:21:16 UTC |
| 0b0fe4a | Shawn Pearce | 11 July 2006, 00:27:54 UTC | Allow user.name and user.email to drive reflog entry. Apparently calling setup_ident() after git_config causes the user.name and user.email values read from the config file to be replaced with the data obtained from the host. This means that users who have setup their email address in user.email will instead be writing reflog entries with their hostname. Moving setup_ident() to before git_config in update-ref resolves this ordering problem. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 July 2006, 04:12:40 UTC |
| b75a82b | Johannes Schindelin | 10 July 2006, 11:40:44 UTC | Fix linking for not-so-clever linkers. On one of my systems, the linker is not intelligent enough to link with pager.o (in libgit.a) when only the variable pager_in_use is needed. The consequence is that the linker complains about an undefined variable. So, put the variable into environment.o, where it is linked always. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 July 2006, 21:48:56 UTC |
| f443455 | Matthias Lederhofer | 10 July 2006, 17:57:21 UTC | git-rev-list: add documentation for --parents, --no-merges Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 July 2006, 20:48:22 UTC |
| 868227b | Junio C Hamano | 10 July 2006, 07:53:39 UTC | Merge branch 'jc/show-merge' * jc/show-merge: git log -p --merge [[--] paths...] | 10 July 2006, 07:53:39 UTC |
| a9486b0 | Pavel Roskin | 10 July 2006, 06:57:51 UTC | Avoid C99 comments, use old-style C comments instead. This doesn't make the code uglier or harder to read, yet it makes the code more portable. This also simplifies checking for other potential incompatibilities. "gcc -std=c89 -pedantic" can flag many incompatible constructs as warnings, but C99 comments will cause it to emit an error. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 July 2006, 07:47:13 UTC |
| 82e5a82 | Pavel Roskin | 10 July 2006, 05:50:18 UTC | Fix more typos, primarily in the code The only visible change is that git-blame doesn't understand "--compability" anymore, but it does accept "--compatibility" instead, which is already documented. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 July 2006, 07:36:44 UTC |
| 930cf7d | Luben Tuikov | 10 July 2006, 03:18:57 UTC | gitweb.cgi: Teach "a=blob" action to know the blob/file mime type Now action "blob" knows the file type: if the file type is not "text/*" then action "blob" defaults to "blob_plain", i.e. the file is downloaded raw for the browser to interpret. If the file type is "text/*", then "blob" defaults to the current "cat -n"-like output, from which you can click "plain", to get the "blob_plain" output. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 July 2006, 07:30:11 UTC |
| 9af2511 | Luben Tuikov | 10 July 2006, 03:07:27 UTC | gitweb.cgi: Create $git_temp if it doesn't exist Unless we'd done diffs, $git_temp doesn't exist and then mime lookups fail. Explicitly create it, if it doesn't exist already. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 July 2006, 07:21:33 UTC |
| 8499294 | Junio C Hamano | 10 July 2006, 07:20:42 UTC | Merge branch 'lt/gitweb' * lt/gitweb: Add "raw" output option to blobs in "tree" view format | 10 July 2006, 07:20:42 UTC |
| 4ad4515 | Eric Wong | 10 July 2006, 03:20:48 UTC | git-svn: fix --file/-F option in commit-diff Also, allow messages from tags to be used as commit messages. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 July 2006, 07:19:34 UTC |
| 344c52a | Shawn Pearce | 08 July 2006, 18:34:02 UTC | Avoid C99 initializers In a handful places, we use C99 structure and array initializers, which some compilers do not support. This can be handy when you are trying to compile GIT on a Solaris system that has an older C compiler, for example. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 July 2006, 07:13:28 UTC |
| 4f12d52 | Junio C Hamano | 10 July 2006, 07:03:55 UTC | Merge branch 'jc/rename' * jc/rename: diffcore-rename: try matching up renames without populating filespec first. | 10 July 2006, 07:03:55 UTC |
| 405a99a | Junio C Hamano | 10 July 2006, 06:49:03 UTC | Merge branch 'jc/grep' * jc/grep: git-grep: boolean expression on pattern matching. | 10 July 2006, 06:49:03 UTC |
| 12d4a97 | Junio C Hamano | 10 July 2006, 06:49:00 UTC | Merge branch 'jc/mailinfo' * jc/mailinfo: mailinfo: assume input is latin-1 on the header as we do for the body | 10 July 2006, 06:49:00 UTC |
| fc93dbb | Junio C Hamano | 10 July 2006, 06:47:39 UTC | Merge branch 'ew/diff' * ew/diff: templates/hooks--update: replace diffstat calls with git diff --stat diff: do not use configuration magic at the core-level Update diff-options and config documentation. diff.c: --no-color to defeat diff.color configuration. diff.c: respect diff.renames config option | 10 July 2006, 06:47:39 UTC |
| e6ff54a | Junio C Hamano | 10 July 2006, 06:37:19 UTC | Merge branch 'ew/svn' * ew/svn: Fix some doubled word typos Typofix in Makefile comment. Makefile: export NO_SVN_TESTS git-svn: migrate out of contrib (follow-up) git-svn: migrate out of contrib | 10 July 2006, 06:37:19 UTC |
| cd6f207 | A Large Angry SCM | 05 July 2006, 00:35:20 UTC | Additional merge-base tests (revised) Signed-off-by: A Large Angry SCM <gitzilla@gmail.com> | 09 July 2006, 10:38:12 UTC |
| f324943 | Junio C Hamano | 05 July 2006, 01:46:42 UTC | merge-base: update the clean-up postprocessing This removes the "contaminate the well even more" approach taken in the current merge-base postprosessing code. Instead, when there are more than one merge-base results, we compute the merge-base between them and see if one is a fast-forward of the other, in which case the ancestor is removed from the result. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 July 2006, 10:38:12 UTC |
| ff4c848 | Alp Toker | 09 July 2006, 09:36:24 UTC | Fix typos involving the word 'commit' Signed-off-by: Alp Toker <alp@atoker.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 July 2006, 10:31:36 UTC |
| cb65296 | Alp Toker | 09 July 2006, 09:36:23 UTC | Fix some doubled word typos Signed-off-by: Alp Toker <alp@atoker.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 July 2006, 10:30:51 UTC |
| 3e564f3 | Alp Toker | 09 July 2006, 09:36:23 UTC | Fix some doubled word typos Signed-off-by: Alp Toker <alp@atoker.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 July 2006, 10:29:35 UTC |
| 85fb65e | Junio C Hamano | 06 June 2006, 23:58:40 UTC | "git -p cmd" to page anywhere This allows you to say: git -p diff v2.6.16-rc5.. and the command pipes the output of any git command to your pager. [jc: this resurrects a month old RFC patch with improvement suggested by Linus to call it --paginate instead of --less.] Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 July 2006, 10:27:03 UTC |
| cfc01c0 | Matthias Lederhofer | 09 July 2006, 09:59:39 UTC | change ent to tree in git-diff documentation Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 July 2006, 10:26:49 UTC |
| 0285358 | Pavel Roskin | 09 July 2006, 09:44:58 UTC | Typofix in Makefile comment. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 July 2006, 09:44:58 UTC |
| addf88e | Pavel Roskin | 09 July 2006, 07:44:30 UTC | Assorted typo fixes Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 July 2006, 09:42:41 UTC |
| e82e058 | Timo Hirvonen | 28 June 2006, 09:15:00 UTC | GIT_TRACE: fix a mixed declarations and code warning Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 July 2006, 07:57:23 UTC |
| 575ba9d | Matthias Lederhofer | 25 June 2006, 13:56:18 UTC | GIT_TRACE: show which built-in/external commands are executed With the environment variable GIT_TRACE set git will show - alias expansion - built-in command execution - external command execution on stderr. Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 July 2006, 07:57:23 UTC |
| 25b7c18 | Luben Tuikov | 07 July 2006, 06:39:30 UTC | Add "raw" output option to blobs in "tree" view format Add a "raw" output option to blobs in "tree" view format, so that the user doesn't have to click on "blob", wait for the (binary) file to be uploaded and shown in "blob" mode, and then click on "plain" to download the (binary) file. This is useful when the file is clearly binary and we don't want the browser to upload and display it in "blob" mode, but we just want to download it. Case in point: pdf files, wlg. Note: the "raw" format is equivalent to the blob->plain view, not blob->head view. I.e. the view has the hash of the file as listed by git-ls-tree, not just "HEAD". Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 July 2006, 07:57:22 UTC |
| ba84a79 | Linus Torvalds | 06 July 2006, 17:16:22 UTC | builtin "git prune" This actually removes the objects to be pruned, unless you specify "-n" (at which point it will just tell you which files it would prune). This doesn't do the pack-file pruning that the shell-script used to do, but if somebody really wants to, they could add it easily enough. I wonder how useful it is, though, considering that "git repack -a -d" is just a lot more efficient and generates a better end result. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 July 2006, 07:57:22 UTC |
| 88f0d5d | Junio C Hamano | 09 July 2006, 07:52:36 UTC | Merge branch 'sf/diff' | 09 July 2006, 07:52:36 UTC |
| f3aafa4 | Ryan Anderson | 09 July 2006, 06:28:21 UTC | Disable color detection during format-patch Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 July 2006, 07:48:16 UTC |
| 135a522 | Peter Baumann | 07 July 2006, 10:55:41 UTC | git-cvsexportcommit can't handle merge commits correctly git-cvsexportcommit should check if the parent (supplied on the cmdline) to use for a merge commit is one of the real parents of the merge. But it errors out if the _first_ parent doesn't match and never checks the other parents. Signed-off-by: Peter Baumann <siprbaum@stud.informatik.uni-erlangen.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 July 2006, 07:46:56 UTC |
| d9bffc0 | Michal Rokos | 08 July 2006, 15:32:04 UTC | Using 'perl' in *.sh Some GIT's shell script are using bare 'perl' for perl invocation. Use @@PERL@@ symbol and replace it with PERL_PATH_SQ everywhere. Signed-off-by: Michal Rokos <michal.rokos@nextsoft.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 July 2006, 18:35:20 UTC |
| 6e959ab | Michal Rokos | 08 July 2006, 15:27:10 UTC | sed -e '/RE/r rfile/' needs space in 'r rfile' Some implementations of sed (like HP-UX one) mandate a space between 'r' and 'rfile'. Signed-off-by: Michal Rokos <michal.rokos@nextsoft.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 July 2006, 18:28:32 UTC |
| 6244b24 | Johannes Schindelin | 08 July 2006, 08:56:28 UTC | Close the index file between writing and committing Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 July 2006, 10:28:19 UTC |
| 3a895e0 | Eric Wong | 08 July 2006, 08:50:02 UTC | templates/hooks--update: replace diffstat calls with git diff --stat Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 July 2006, 10:11:16 UTC |
| 83ad63c | Junio C Hamano | 08 July 2006, 08:05:16 UTC | diff: do not use configuration magic at the core-level The Porcelainish has become so much usable as the UI that there is not much reason people should be using the core programs by hand anymore. At this point we are better off making the behaviour of the core programs predictable by keeping them unaffected by the configuration variables. Otherwise they will become very hard to use as reliable building blocks. For example, "git-commit -a" internally uses git-diff-files to figure out the set of paths that need to be updated in the index, and we should never allow diff.renames that happens to be in the configuration to interfere (or slow down the process). The UI level configuration such as showing renamed diff and coloring are still honored by the Porcelainish ("git log" family and "git diff"), but not by the core anymore. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 July 2006, 10:11:01 UTC |
| a0c2089 | Junio C Hamano | 08 July 2006, 00:48:02 UTC | colored diff: diff.color = auto fix Even if the standard output is connected to a tty, do not colorize the diff if we are talking to a dumb terminal when diff.color configuration variable is set to "auto". Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 July 2006, 00:48:02 UTC |
| ae3e5e1 | Junio C Hamano | 03 July 2006, 09:59:32 UTC | git log -p --merge [[--] paths...] This adds Linus's wish, "--merge" flag, which makes the above expand to a rough equivalent to: git log -p HEAD MERGE_HEAD ^$(git-merge-base HEAD MERGE_HEAD) \ -- $(git-ls-files -u [paths...] | cut -f2 | uniq) Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 July 2006, 20:32:31 UTC |
| 140245b | Johannes Schindelin | 07 July 2006, 11:26:31 UTC | Makefile: export NO_SVN_TESTS Without this patch, it really is not sufficient to define NO_SVN_TESTS in config.mak or the Makefile. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 July 2006, 19:43:45 UTC |
| b537664 | Junio C Hamano | 07 July 2006, 12:28:05 UTC | Update diff-options and config documentation. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 July 2006, 19:28:54 UTC |
| fef88bb | Junio C Hamano | 07 July 2006, 12:27:24 UTC | diff.c: --no-color to defeat diff.color configuration. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 July 2006, 19:28:54 UTC |
| b68ea12 | Eric Wong | 07 July 2006, 11:01:23 UTC | diff.c: respect diff.renames config option diff.renames is mentioned several times in the documentation, but to my surprise it didn't do anything before this patch. Also add the --no-renames option to override this from the command-line. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 July 2006, 19:28:53 UTC |
| d507bb1 | Stephan Feder | 07 July 2006, 13:57:09 UTC | diff-options: Explain --text and -a Signed-off-by: Stephan Feder <sf@b-i-t.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 July 2006, 19:28:04 UTC |
| ca49920 | Stephan Feder | 07 July 2006, 13:57:08 UTC | Add -a and --text to common diff options help Signed-off-by: Stephan Feder <sf@b-i-t.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 July 2006, 19:28:04 UTC |
| 63ac450 | Stephan Feder | 07 July 2006, 13:57:07 UTC | Teach diff -a as shorthand for --text Signed-off-by: Stephan Feder <sf@b-i-t.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 July 2006, 19:28:04 UTC |
| 6d64ea9 | Stephan Feder | 07 July 2006, 10:33:57 UTC | Teach --text option to diff Add new item text to struct diff_options. If set then do not try to detect binary files. Signed-off-by: Stephan Feder <sf@b-i-t.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 July 2006, 19:28:04 UTC |
| 6bdca89 | Jakub Narebski | 07 July 2006, 18:57:55 UTC | send-email: format 2822 datestring ourselves. It is not worth trying to force C locale (and failing) just to format the 2822 datestring. This code was borrowed from /usr/bin/822-date (Ian Jackson and Klee Dienes, both in public domain), per suggestion by Eric Wong. Signed-off-by: Junio C Hamano <junkio@cox.net> Acked-by: Jakub Narebski <jnareb@gmail.com> | 07 July 2006, 19:17:49 UTC |
