aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* GIT 1.5.4.2v1.5.4.2Junio C Hamano2008-02-17
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Documentation/git-reset: Add an example of resetting selected pathsPieter de Bie2008-02-16
| | | | | Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Documentation/git-reset: don't mention --mixed for selected-paths resetPieter de Bie2008-02-16
| | | | | | | | | The option is accepted, but that is the only form selected-paths variant of the reset command takes, so there is no point mentioning it. And while we're at it, use the dashless git call. Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Documentation/git-reset:Junio C Hamano2008-02-16
| | | | | | | | Since 3368d11 (Remove unnecessary git-rm --cached reference from status output), the status output marks the "Added but not yet committed" section as "Changes to be committed". Signed-off-by: Junio C Hamano <gitster@pobox.com>
* commit: discard index after setting up partial commitJeff King2008-02-16
| | | | | | | | | | | | | | | | There may still be some entries from the original index that should be discarded before we show the status. In particular, if a file was added in the index but not included in the partial commit, it would still show up in the status listing as staged for commit. Ultimately the correct fix is to keep the two states in separate index_state variables. Then we can avoid having to reload the cache from the temporary file altogether, and just point wt_status_print at the correct index. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* filter-branch: handle filenames that need quotingJunio C Hamano2008-02-15
| | | | | | | | | | The command used a very old fashioned construct to extract filenames out of diff-index and ended up corrupting the output. We can simply use --name-only and pipe into --stdin mode of update-index. It's been like that for the past 2 years or so since a94d994 (update-index: work with c-quoted name). Signed-off-by: Junio C Hamano <gitster@pobox.com>
* diff: Fix miscounting of --check outputJunio C Hamano2008-02-15
| | | | | | | | | | | | | c1795bb (Unify whitespace checking) incorrectly made the checking function return without incrementing the line numbers when there is no whitespace problem is found on a '+' line. This resurrects the earlier behaviour. Noticed and reported by Jay Soffian. The test script was stolen from Jay's independent fix. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* hg-to-git: fix parent analysisStelian Pop2008-02-15
| | | | | | | | | | | | | | | Fix a bug in the hg-to-git convertor introduced by commit 1bc7c13af9f936aa80893100120b542338a10bf4: when searching the changeset parents, 'hg log' returns an extra space at the end of the line, which confuses the .split(' ') based tokenizer: Traceback (most recent call last): File "hg-to-git.py", line 123, in <module> hgchildren[mparent] += ( str(cset), ) KeyError: '' Signed-off-by: Stelian Pop <stelian@popies.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* mailinfo: feed only one line to handle_filter() for QP inputJay Soffian2008-02-15
| | | | | | | | | | | | | | The function is intended to be fed one logical line at a time to inspect, but a QP encoded raw input line can have more than one lines, just like BASE64 encoded one. Quoting LF as =0A may be unusual but RFC2045 allows it. The issue was noticed and fixed by Jay Soffian. JC added a test to protect the fix from regressing later. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* diff.c: add "const" qualifier to "char *cmd" member of "struct ll_diff_driver"Christian Couder2008-02-15
| | | | | | | Also use "git_config_string" to simplify code where "cmd" is set. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Add "const" qualifier to "char *excludes_file".Christian Couder2008-02-15
| | | | | | | | Also use "git_config_string" to simplify "config.c" code where "excludes_file" is set. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Add "const" qualifier to "char *editor_program".Christian Couder2008-02-15
| | | | | | | | Also use "git_config_string" to simplify "config.c" code where "editor_program" is set. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Add "const" qualifier to "char *pager_program".Christian Couder2008-02-15
| | | | | | | | Also use "git_config_string" to simplify "config.c" code where "pager_program" is set. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* config: add 'git_config_string' to refactor string config variables.Christian Couder2008-02-15
| | | | | | | | | | | | | | | | | In many places we just check if a value from the config file is not NULL, then we duplicate it and return 0. This patch introduces the new 'git_config_string' function to do that. This function is also used to refactor some code in 'config.c'. Refactoring other files is left for other patches. Also not all the code in "config.c" is refactored, because the function takes a "const char **" as its first parameter, but in many places a "char *" is used instead of a "const char *". (And C does not allow using a "char **" instead of a "const char **" without a warning.) Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* diff.c: remove useless check for value != NULLChristian Couder2008-02-15
| | | | | | | | | | | | | | | It is not necessary to check if value != NULL before calling 'parse_lldiff_command' as there is already a check inside this function. By the way this patch also improves the existing check inside 'parse_lldiff_command' by using: return config_error_nonbool(var); instead of: return error("%s: lacks value", var); Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* fast-import: check return value from unpack_entry()Shawn O. Pearce2008-02-15
| | | | | | | | | | | If the tree object we have asked for is deltafied in the packfile and the delta did not apply correctly or was not able to be decompressed from the packfile then we can get back NULL instead of the tree data. This is (part of) the reason why read_sha1_file() can return NULL, so we need to also handle it the same way. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Validate nicknames of remote branches to prohibit confusing onesDaniel Barkalow2008-02-15
| | | | | | | | | | | | | | The original problem was that the parsers for configuration files were getting confused by seeing as nicknames remotes that involved directory-changing characters. In particular, the branches config file for ".." was particularly mystifying on platforms that can open directories and read odd data from them. The validation function was written by Junio Hamano (with a typo corrected). Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* diff.c: replace a 'strdup' with 'xstrdup'.Christian Couder2008-02-15
| | | | | Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* diff.c: fixup garding of config parser from value=NULLJunio C Hamano2008-02-15
| | | | | | | | Christian Couder noticed that there still were a handcrafted error() call that we should have converted to config_error_nonbool() where parse_lldiff_command() parses the configuration file. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* config: add test cases for empty value and no value config variables.Christian Couder2008-02-13
| | | | | | | | | | | | | | | | | | | | The tests in 't1300-repo-config.sh' did not check what happens when an empty value like the following is used in the config file: [emptyvalue] variable = Also it was not checked that a variable with no value like the following: [novalue] variable gives a boolean "true" value, while an ampty value gives a boolean "false" value. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* cvsimport: have default merge regex also match beginning of commit messageGerrit Pape2008-02-13
| | | | | | | | | | | | | The default value of @mergerx uses \W, which matches a non-word character; this means that commit messages like "Merging FOO" are not matched by default; using \b, which matches a word boundary, instead of \W fixes that. This change was suggested by Frédéric Brière through http://bugs.debian.org/463468 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git clone -s documentation: force a new paragraph for the NOTEMiklos Vajna2008-02-13
| | | | | | | It should be loud and clear. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* status: suggest "git rm --cached" to unstage for initial commitJeff King2008-02-13
| | | | | | | | | | | | | | | | | It makes no sense to suggest "git reset HEAD" since we have no HEAD commit. This actually used to work but regressed in f26a0012. wt_status_print_cached_header was updated to take the whole wt_status struct rather than just the reference field. Previously the various code paths were sometimes sending in s->reference and sometimes sending in NULL, making the decision on whether this was an initial commit before we even got to this function. Now we must check the initial flag here. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Protect get_author_ident_from_commit() from filenames in work treeJunio C Hamano2008-02-13
| | | | | | | | | | | | | | | | | We used to use "cat-file commit $commit" to extract the original author information from existing commit, but an earlier commit 5ac2715 (Consistent message encoding while reusing log from an existing commit) changed it to use "git show -s $commit". If you have a file in your work tree that can be interpreted as a valid object name (e.g. "HEAD"), this conversion will not work. Disambiguate by marking the end of revision parameter on the comand line with an explicit "--" to fix this. This breakage is most visible with rebase when a file called "HEAD" exists in the worktree. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* upload-pack: Initialize the exec-path.Johannes Sixt2008-02-13
| | | | | | | | | | | Since git-upload-pack has to spawn git-pack-objects, it has to make sure that the latter can be found in the PATH. Without this patch an attempt to clone or pull via ssh from a server fails if the git tools are not in the standard PATH on the server even though git clone or git pull were invoked with --upload-pack=/path/to/git-upload-pack. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* bisect: use verbatim commit subject in the bisect logJohannes Schindelin2008-02-13
| | | | | | | | | | Due to a typo, the commit subject was shell expanded in the bisect log. That is, if you had some shell pattern in the commit subject, bisect would happily put all matching file names into the log. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Tested-by: Frans Pop <elendil@planet.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-cvsimport.txt: fix '-M' description.Sergei Organov2008-02-13
| | | | | | | | Fix '-M' description. Old one reads as if the user can somehow "see" the default regex when using -M along with -m. Signed-off-by: Sergei Organov <osv@javad.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Revert "pack-objects: only throw away data during memory pressure"Junio C Hamano2008-02-12
| | | | | | | | | | | | | | | | | | | | This reverts commit 9c2174350cc0ae0f6bad126e15fe1f9f044117ab. Nico analyzed and found out that this does not really help, and I agree with it. By the time this gets into action and data is actively thrown away, performance simply goes down the drain due to the data constantly being reloaded over and over and over and over and over and over again, to the point of virtually making no relative progress at all. The previous behavior of enforcing the memory limit by dynamically shrinking the window size at least had the effect of allowing some kind of progress, even if the end result wouldn't be optimal. And that's the whole point behind this memory limiting feature: allowing some progress to be made when resources are too limited to let the repack go unbounded.
* config.c: guard config parser from value=NULLJunio C Hamano2008-02-11
| | | | | | | 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>
* builtin-log.c: guard config parser from value=NULLJunio C Hamano2008-02-11
| | | | | | format.suffix expects a string value. format.numbered is bool plus "auto" Signed-off-by: Junio C Hamano <gitster@pobox.com>
* imap-send.c: guard config parser from value=NULLJunio C Hamano2008-02-11
| | | | | | None of the configuration variables this expects is boolean. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* wt-status.c: guard config parser from value=NULLJunio C Hamano2008-02-11
| | | | | | status.color.* and color.status.* expect a string value Signed-off-by: Junio C Hamano <gitster@pobox.com>
* setup.c: guard config parser from value=NULLJunio C Hamano2008-02-11
| | | | | | core.worktree expects a string value Signed-off-by: Junio C Hamano <gitster@pobox.com>
* remote.c: guard config parser from value=NULLJunio C Hamano2008-02-11
| | | | | | branch.*.{remote,merge} expect a string value Signed-off-by: Junio C Hamano <gitster@pobox.com>
* merge-recursive.c: guard config parser from value=NULLJunio C Hamano2008-02-11
| | | | | | merge.default, merge.*.{name,driver} expect a string value Signed-off-by: Junio C Hamano <gitster@pobox.com>
* http.c: guard config parser from value=NULLJunio C Hamano2008-02-11
| | | | | | http.sslcert and friends expect a string value Signed-off-by: Junio C Hamano <gitster@pobox.com>
* help.c: guard config parser from value=NULLJunio C Hamano2008-02-11
| | | | | | help.format configuration expects a string value Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git.c: guard config parser from value=NULLJunio C Hamano2008-02-11
| | | | | | alias.* configuration expects a string value Signed-off-by: Junio C Hamano <gitster@pobox.com>
* diff.c: guard config parser from value=NULLJunio C Hamano2008-02-11
| | | | | | | 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>
* convert.c: guard config parser from value=NULLJunio C Hamano2008-02-11
| | | | | | | filter.*.smudge and filter.*.clean configuration variables expect a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* connect.c: guard config parser from value=NULLJunio C Hamano2008-02-11
| | | | | | core.gitproxy configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* builtin-tag.c: guard config parser from value=NULLJunio C Hamano2008-02-11
| | | | | | user.signingkey configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* builtin-show-branch.c: guard config parser from value=NULLJunio C Hamano2008-02-11
| | | | | | showbranch.default configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* builtin-reflog.c: guard config parser from value=NULLJunio C Hamano2008-02-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>
* builtin-log.c: guard config parser from value=NULLJunio C Hamano2008-02-11
| | | | | | format.subjectprefix configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* builtin-config.c: guard config parser from value=NULLJunio C Hamano2008-02-11
| | | | | | color configuration variables expect a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* builtin-commit.c: guard config parser from value=NULLJunio C Hamano2008-02-11
| | | | | | commit.template configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* builtin-branch.c: guard config parser from value=NULLJunio C Hamano2008-02-11
| | | | | | color.branch.* configuration variables expect a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* builtin-apply.c: guard config parser from value=NULLJunio C Hamano2008-02-11
| | | | | | apply.whitespace configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Add config_error_nonbool() helper functionJunio C Hamano2008-02-11
| | | | | | | | | | | | | | 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>
generated by cgit v1.2.1 (git 2.18.0) at 2024-09-13 22:16:43 +0000