summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2008-02-13Merge git://git.kernel.org/pub/scm/gitk/gitkLibravatar Junio C Hamano1-51/+61
* git://git.kernel.org/pub/scm/gitk/gitk: [PATCH] gitk: learn --show-all output [PATCH] gitk: properly deal with tag names containing / (slash) [PATCH] gitk: Add checkbutton to ignore space changes [PATCH] gitk: Fix "Key bindings" message
2008-02-13[PATCH] gitk: learn --show-all outputLibravatar Linus Torvalds1-7/+8
It's really not very easy to visualize the commit walker, because - on purpose - it obvously doesn't show the uninteresting commits! We will soon add a "--show-all" flag to the revision walker, which will make it show uninteresting commits too, and they'll have a '^' in front of them. This is to update 'gitk' to show those negative commits in gray to futureproof it. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-02-12Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIRLibravatar Johan Herland2-7/+6
When using the '-w $cvsdir' option to cvsexportcommit, it will chdir into $cvsdir before executing several other git commands. If $GIT_DIR is set to a relative path (e.g. '.'), the git commands executed by cvsexportcommit will naturally fail. Therefore, ensure that $GIT_DIR is absolute before the chdir to $cvsdir. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-12Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIRLibravatar Johan Herland1-1/+17
The testcase verifies that 'git cvsexportcommit' functions correctly when the '-w' option is used, and GIT_DIR is set to a relative path (e.g. '.'). Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11.mailmap: adjust to a recent patch application glitch.Libravatar Junio C Hamano1-0/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11Update the main documentation (stale notes section)Libravatar Junio C Hamano1-1/+2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11Merge branch 'db/no-separate-ls-remote-connection' (early part)Libravatar Junio C Hamano6-56/+95
* 'db/no-separate-ls-remote-connection' (early part): Fix "git clone" for git:// protocol Reduce the number of connects when fetching
2008-02-11Merge branch 'mw/send-email'Libravatar Junio C Hamano2-27/+106
* mw/send-email: git-send-email: Better handling of EOF git-send-email: SIG{TERM,INT} handlers git-send-email: ssh/login style password requests
2008-02-11Merge branch 'db/send-email-omit-cc'Libravatar Junio C Hamano2-7/+60
* db/send-email-omit-cc: git-send-email: Generalize auto-cc recipient mechanism.
2008-02-11Merge branch 'jc/error-message-in-cherry-pick'Libravatar Junio C Hamano5-58/+79
* jc/error-message-in-cherry-pick: Make error messages from cherry-pick/revert more sensible
2008-02-11Merge branch 'lt/in-core-index'Libravatar Junio C Hamano25-296/+566
* lt/in-core-index: lazy index hashing Create pathname-based hash-table lookup into index read-cache.c: introduce is_racy_timestamp() helper read-cache.c: fix a couple more CE_REMOVE conversion Also use unpack_trees() in do_diff_cache() Make run_diff_index() use unpack_trees(), not read_tree() Avoid running lstat(2) on the same cache entry. index: be careful when handling long names Make on-disk index representation separate from in-core one
2008-02-11Merge branch 'ph/describe-match'Libravatar Junio C Hamano3-15/+45
* ph/describe-match: git-name-rev: add a --(no-)undefined option. git-describe: Add a --match option to limit considered tags.
2008-02-12[PATCH] gitk: properly deal with tag names containing / (slash)Libravatar Gerrit Pape1-5/+1
When creating a tag through gitk, and the tag name includes a slash (or slashes), gitk errors out in a popup window. This patch makes gitk use 'git tag' to create the tag instead of modifying files in refs/tags/, which fixes the issue; if 'git tag' throws an error, gitk pops up with the error message. The problem was reported by Frédéric Brière through http://bugs.debian.org/464104 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-02-12[PATCH] gitk: Add checkbutton to ignore space changesLibravatar Steffen Prohaska1-0/+13
Ignoring space changes can be helpful. For example, a commit claims to only reformat source code and you quickly want to verify if this claim is true. Or a commit accidentally changes code formatting and you want to focus on the real changes. In such cases a button to toggle of whitespace changes would be quite handy. You could quickly toggle between seeing and ignoring whitespace changes. This commit adds such a checkbutton right above the diff view. However, in general it is a good thing to see whitespace changes and therefore the state of the checkbutton is not saved. For example, space changes might happen unintentionally. But they are real changes yielding different sha1s for the blobs involved. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-02-12[PATCH] gitk: Fix "Key bindings" messageLibravatar Michele Ballabio1-39/+39
The "Key bindings" message under the "Help" menu was too long and could not be parsed by the translation engine. Fix both issues by translating one line at a time. Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-02-11git-blame.el: show the when, who and what in the minibuffer.Libravatar Junichi Uekawa1-1/+9
Change the default operation to show 'when (day the commit was made), who (who made the commit), what (what the commit log was)' in the minibuffer instead of SHA1 and title of the commit log. Since the user may prefer other displaying options, it is made as a user-configurable option. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11Define the project whitespace policyLibravatar Junio C Hamano3-0/+4
This establishes what the "bad" whitespaces are for this project. The rules are: - Unless otherwise specified, indent with SP that could be replaced with HT are not "bad". But SP before HT in the indent is "bad", and trailing whitespaces are "bad". - For C source files, initial indent by SP that can be replaced with HT is also "bad". - Test scripts in t/ and test vectors in its subdirectories can contain anything, so we make it unrestricted for now. Anything "bad" will be shown in WHITESPACE error indicator in diff output, and "apply --whitespace=warn" will warn about it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11Add `git svn blame' commandLibravatar Tim Stoakes2-0/+28
This command is identical to `git blame', but it shows SVN revision numbers instead of git commit hashes. [ew: support "^initial commit" and minor formatting fixes] Signed-off-by: Tim Stoakes <tim@stoakes.net> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11Merge branch 'maint'Libravatar Junio C Hamano34-59/+255
* maint: (35 commits) config.c: guard config parser from value=NULL builtin-log.c: guard config parser from value=NULL imap-send.c: guard config parser from value=NULL wt-status.c: guard config parser from value=NULL setup.c: guard config parser from value=NULL remote.c: guard config parser from value=NULL merge-recursive.c: guard config parser from value=NULL http.c: guard config parser from value=NULL help.c: guard config parser from value=NULL git.c: guard config parser from value=NULL diff.c: guard config parser from value=NULL convert.c: guard config parser from value=NULL connect.c: guard config parser from value=NULL builtin-tag.c: guard config parser from value=NULL builtin-show-branch.c: guard config parser from value=NULL builtin-reflog.c: guard config parser from value=NULL builtin-log.c: guard config parser from value=NULL builtin-config.c: guard config parser from value=NULL builtin-commit.c: guard config parser from value=NULL builtin-branch.c: guard config parser from value=NULL ...
2008-02-11config.c: guard config parser from value=NULLLibravatar Junio C Hamano1-1/+15
user.{name,email}, core.{pager,editor,excludesfile,whitespace} and i18n.{commit,logoutput}encoding all expect string values. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11builtin-log.c: guard config parser from value=NULLLibravatar Junio C Hamano1-3/+2
format.suffix expects a string value. format.numbered is bool plus "auto" Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11imap-send.c: guard config parser from value=NULLLibravatar Junio C Hamano1-0/+4
None of the configuration variables this expects is boolean. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11wt-status.c: guard config parser from value=NULLLibravatar Junio C Hamano1-0/+2
status.color.* and color.status.* expect a string value Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11setup.c: guard config parser from value=NULLLibravatar Junio C Hamano1-0/+2
core.worktree expects a string value Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11remote.c: guard config parser from value=NULLLibravatar Junio C Hamano1-3/+6
branch.*.{remote,merge} expect a string value Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11merge-recursive.c: guard config parser from value=NULLLibravatar Junio C Hamano1-5/+6
merge.default, merge.*.{name,driver} expect a string value Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11http.c: guard config parser from value=NULLLibravatar Junio C Hamano1-10/+15
http.sslcert and friends expect a string value Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11help.c: guard config parser from value=NULLLibravatar Junio C Hamano1-0/+2
help.format configuration expects a string value Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11git.c: guard config parser from value=NULLLibravatar Junio C Hamano1-0/+2
alias.* configuration expects a string value Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11diff.c: guard config parser from value=NULLLibravatar Junio C Hamano1-2/+12
diff.external, diff.*.command, diff.color.*, color.diff.* and diff.*.funcname configuration variables expect a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11convert.c: guard config parser from value=NULLLibravatar Junio C Hamano1-2/+2
filter.*.smudge and filter.*.clean configuration variables expect a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11connect.c: guard config parser from value=NULLLibravatar Junio C Hamano1-0/+2
core.gitproxy configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11builtin-tag.c: guard config parser from value=NULLLibravatar Junio C Hamano1-1/+1
user.signingkey configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11builtin-show-branch.c: guard config parser from value=NULLLibravatar Junio C Hamano1-0/+2
showbranch.default configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11builtin-reflog.c: guard config parser from value=NULLLibravatar Junio C Hamano1-5/+11
gc.reflogexpire and gc.reflogexpireunreachable configuration expect a string value suitable for calling approxidate() with. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11builtin-log.c: guard config parser from value=NULLLibravatar Junio C Hamano1-1/+1
format.subjectprefix configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11builtin-config.c: guard config parser from value=NULLLibravatar Junio C Hamano1-0/+2
color configuration variables expect a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11builtin-commit.c: guard config parser from value=NULLLibravatar Junio C Hamano1-0/+2
commit.template configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11builtin-branch.c: guard config parser from value=NULLLibravatar Junio C Hamano1-3/+6
color.branch.* configuration variables expect a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11builtin-apply.c: guard config parser from value=NULLLibravatar Junio C Hamano1-0/+2
apply.whitespace configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11Add config_error_nonbool() helper functionLibravatar Junio C Hamano2-0/+10
This is used to report misconfigured configuration file that does not give any value to a non-boolean variable, e.g. [section] var It is perfectly fine to say it if the section.var is a boolean (it means true), but if a variable expects a string value it should be flagged as a configuration error. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11builtin-gc.c: guard config parser from value=NULLLibravatar Miklos Vajna1-1/+1
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11archive-tar.c: guard config parser from value=NULLLibravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11Work around curl-gnutls not liking to be reinitializedLibravatar Mike Hommey1-4/+3
curl versions 7.16.3 to 7.18.0 included had a regression in which https requests following curl_global_cleanup/init sequence would fail with ASN1 parser errors with curl-gnutls. Such sequences happen in some cases such as git fetch. We work around this by removing the http_init and http_cleanup calls from get_refs_via_curl, replacing them with a transport->data initialization with the http_walker (which does http_init). While the http_walker is not currently used in get_refs_via_curl, http and walker code refactor will make it use it. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11man pages are littered with .ft C and othersLibravatar Jonas Fonseca2-1/+20
Jakub Narebski <jnareb@gmail.com> wrote Sun, Feb 03, 2008: > Junio C Hamano wrote: > > Jakub Narebski <jnareb@gmail.com> writes: > > > > [From] http://thread.gmane.org/gmane.comp.version-control.git/53457/focus=53458 > Julian Phillips: > > Are you using docbook xsl 1.72? There are known problems building the > > manpages with that version. 1.71 works, and 1.73 should work when it get > > released. I was able to solve this problem with this patch, which adds a XSL file used specifically for DOCBOOK_XSL_172=YesPlease and where dots and backslashes are escaped properly so they won't be substituted to the wrong thing further down the "DocBook XSL pipeline". Doing the escaping in the existing callout.xsl breaks v1.70.1. Hopefully v1.73 will end this part of the manpage nightmare. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11Add a BuildRequires for gettext in the spec file.Libravatar James Bowes1-1/+4
Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11pack-objects: only throw away data during memory pressureLibravatar Martin Koegler1-2/+11
If pack-objects hit the memory limit, it deletes objects from the delta window. This patch make it only delete the data, which is recomputed, if needed again. Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at> Acked-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11builtin-commit: remove .git/SQUASH_MSG upon successful commitLibravatar Gerrit Pape1-0/+1
After doing a merge --squash, and commit afterwards, the commit message template SQUASH_MSG in the git directory is not removed, which means that the content of SQUASH_MSG is used as default commit message for all subsequent commits. So have git commit remove the file SQUASH_MSG from the git directory upon a successful commit. The problem was discovered by Frédéric Brière, reported through http://bugs.debian.org/464656 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11Make git prune remove temporary packs that look like write failuresLibravatar David Steven Tweed2-0/+71
Write errors when repacking (eg, due to out-of-space conditions) can leave temporary packs (and possibly other files beginning with "tmp_") lying around which no existing codepath removes and which aren't obvious to the casual user. These can also be multi-megabyte files wasting noticeable space. Unfortunately there's no way to definitely tell in builtin-prune that a tmp_ file is not being used by a concurrent process, such as a fetch. However, it is documented that pruning should only be done on a quiet repository and --expire is honoured (using code from Johannes Schindelin, along with a test case he wrote) so that its safety is the same as that of loose object pruning. Since they might be signs of a problem (unlike orphaned loose objects) the names of any removed files are printed. Signed-off-by: David Tweed (david.tweed@gmail.com) Acked-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11rebase -i: accept -m as advertised in the man pageLibravatar Uwe Kleine-K,Av(Bnig1-1/+1
Signed-off-by: Uwe Kleine-K,Av(Bnig <Uwe.Kleine-Koenig@digi.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 10:28:58 +0000