aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* git.el: Prepend a slash to the file name when adding to .gitignore.Alexandre Julliard2006-07-23
| | | | | | | | This way the ignore command will really only ignore the marked files and not files with the same name in subdirectories. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git.el: Run git-rerere on commits if the rr-cache directory exists.Alexandre Julliard2006-07-23
| | | | | Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-svn: fix fetching new directories copies when using SVN:: libsEric Wong2006-07-23
| | | | | | | | | | | | | | | | | Log output from SVN doesn't list all the new files that were added if a new directory was copied from an existing place in the repository. This means we'll have to do some extra work and traverse new directories ourselves. This has been updated from the original patch to defer traversed adds until all removals have been done. Please disregard the original. Thanks to Ben Williamson for the excellent bug report and testing. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* tar-tree: add the "tar.umask" config optionWilly Tarreau2006-07-23
| | | | | | | | | | | | | | | | By default, git-tar-tree(1) sets file and directories modes to 0666 or 0777. While this is both useful and acceptable for projects such as the Linux Kernel, it might be excessive for other projects. With this variable, it becomes possible to tell git-tar-tree(1) to apply a specific umask to the modes above. The special value "user" indicates that the user's current umask will be used. This should be enough for most projects, as it will lead to the same permissions as git-checkout(1) would use. The default value remains 0, which means world read-write. Signed-off-by: Willy Tarreau <w@1wt.eu> Acked-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* cvsexportcommit - add -a (add author line) flag, cleanup warningsMartin Langhoff2006-07-23
| | | | | | | | | | This patch adds support for -a which will add an "Author: " line, and possibly a "Committer: " line to the bottom of the commit message for CVS. The commit message parser is now a little bit better, and some warnings have been cleaned up. Signed-off-by: Junio C Hamano <junkio@cox.net>
* unpack-objects: remove stale and confusing commentJunio C Hamano2006-07-17
| | | | | | | | | The very initial version of unpack-objects.c::unpack_all() used to unpack from the end of the pack, but since end of June last year it was changed to stream from the front and the comment does not reflect the reality anymore. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-fetch: fix --keep vs --thinJunio C Hamano2006-07-17
| | | | | | | | When --keep is specified there is no reason to pass --thin to git-fetch-pack, which are mutually exclusive. This does not hurt because fetch-pack disables thin transfer when both are given internally, but still is confusing. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'sp/reflog'v1.4.2-rc1Junio C Hamano2006-07-17
|\ | | | | | | | | | | | | | | * 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.
| * Record rebase changes as 'rebase' in the reflog.Shawn Pearce2006-07-13
| | | | | | | | | | Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Log ref changes made by resolve.Shawn Pearce2006-07-11
| | | | | | | | | | | | | | | | 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>
| * Log ref changes made by quiltimport.Shawn Pearce2006-07-11
| | | | | | | | | | | | | | | | | | 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>
| * Log ref changes made by git-merge and git-pull.Shawn Pearce2006-07-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | git-svn: don't check for migrations/upgrades on commit-diffEric Wong2006-07-16
| | | | | | | | | | | | | | | | 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>
* | show-branch: fix performance problem.Junio C Hamano2006-07-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Documentation/urls.txt: Use substitution to escape square bracketsJonas Fonseca2006-07-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Documentation/Makefile: product depends on asciidoc.confJunio C Hamano2006-07-14
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'lt/unitype'Junio C Hamano2006-07-14
|\ \ | | | | | | | | | | | | | | | * lt/unitype: builtin-prune.c: forgot TYPE => OBJ changes. Remove TYPE_* constant macros and use object_type enums consistently.
| * | builtin-prune.c: forgot TYPE => OBJ changes.Junio C Hamano2006-07-13
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Remove TYPE_* constant macros and use object_type enums consistently.Linus Torvalds2006-07-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge branch 'sp/lazy-mkdir'Junio C Hamano2006-07-14
|\ \ \ | | | | | | | | | | | | | | | | * sp/lazy-mkdir: Make lazy mkdir more robust.
| * | | Make lazy mkdir more robust.Shawn Pearce2006-07-12
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Fix "git-fetch --tags" exit status when nothing has been changedSergey Vlasov2006-07-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | argv created by handle_alias should be NULL terminatedMatthias Lederhofer2006-07-14
| | | | | | | | | | | | | | | Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | documentation (urls.txt) typofixAlp Toker2006-07-14
| | |
* | | gitweb.css: Use monospace fonts for commits and tree-diff.Luben Tuikov2006-07-13
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Do not use perl in git-commit.shAlex Riesen2006-07-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | diff: Support 256 colorsTimo Hirvonen2006-07-13
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | diff: Support both attributes and colorsTimo Hirvonen2006-07-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Documentation about exclude/ignore filesMatthias Lederhofer2006-07-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | daemon: new option --detach to run git-daemon in backgroundMatthias Lederhofer2006-07-13
| | | | | | | | | | | | | | | Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | daemon: new option --pid-file=<path> to store the pidMatthias Lederhofer2006-07-13
| | | | | | | | | | | | | | | Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | upload-pack: ignore write errors to stderrMatthias Lederhofer2006-07-13
| | | | | | | | | | | | | | | Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | daemon: if one of the standard fds is missing open it to /dev/nullMatthias Lederhofer2006-07-13
| | | | | | | | | | | | | | | Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | daemon: use a custom die routine with syslogMatthias Lederhofer2006-07-13
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Documentation: Fix ssh://[user@]host.xz URLJunio C Hamano2006-07-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Adjust t4013 tests to corrected format-patch.Junio C Hamano2006-07-13
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | format-patch: Generate a newline between the subject header and the message bodyRobert Shearman2006-07-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | t4013 diff format tests updateJunio C Hamano2006-07-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Display help for Git mode after pressing `h' or `?' in *git-status*Jakub Narebski2006-07-13
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Wrap long lines in docstrings in contrib/emacs/git.elJakub Narebski2006-07-13
|/ / | | | | | | | | Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'ml/trace'Junio C Hamano2006-07-12
|\ \ | | | | | | | | | | | | | | | | | | * 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
| * | test-lib: unset GIT_TRACEJunio C Hamano2006-07-12
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | GIT_TRACE: fix a mixed declarations and code warningTimo Hirvonen2006-07-09
| | | | | | | | | | | | | | | Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | GIT_TRACE: show which built-in/external commands are executedMatthias Lederhofer2006-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | git-repack: avoid redirecting stderr into git-pack-objectsJunio C Hamano2006-07-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Fix grammatical error in git-revertJunio C Hamano2006-07-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge branch 'js/merge-base'Junio C Hamano2006-07-12
|\ \ \ | | | | | | | | | | | | | | | | | | | | * js/merge-base: Additional merge-base tests (revised) merge-base: update the clean-up postprocessing
| * | | Additional merge-base tests (revised)A Large Angry SCM2006-07-09
| | | | | | | | | | | | | | | | Signed-off-by: A Large Angry SCM <gitzilla@gmail.com>
| * | | merge-base: update the clean-up postprocessingJunio C Hamano2006-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge branch 'lt/prune'Junio C Hamano2006-07-12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * lt/prune: builtin "git prune"
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-31 19:31:16 +0000