summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ff/svnimport'Junio C Hamano2006-06-031-2/+9
|\ | | | | | | | | * ff/svnimport: git-svnimport: Improved detection of merges.
| * git-svnimport: Improved detection of merges.Florian Forster2006-05-311-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | The regexes detecting merges (while still relying on the commit messages, though) have been improved to catch saner (and hopefully more) messages. The old regex was so generic that it often matched something else and missed the actual merge-message. Also, the regex given with the `-M' commandline-option is checked first: Explicitely given regexes should be considered better than the builtin ones, and should therefore be given a chance to match a message first. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | read-tree --reset: update working tree file for conflicted paths.Junio C Hamano2006-06-031-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The earlier "git reset --hard" simplification stopped removing leftover working tree files from a failed automerge, when switching back to the HEAD version that does not have the paths. This patch, instead of removing the unmerged paths from the index, drops them down to stage#0 but marks them with mode=0 (the same "to be deleted" marker we internally use for paths deleted by the merge). one_way_merge() function and the functions it calls already know what to do with them -- if the tree we are reading has the path the working tree file is overwritten, and if it doesn't the working tree file is removed. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'jc/fmt-patch'Junio C Hamano2006-06-034-39/+113
|\ \ | | | | | | | | | | | | | | | | | | * jc/fmt-patch: Update documentation for git-format-patch format-patch: resurrect extra headers from config format-patch --signoff
| * \ Merge branch 'ds/doc' into jc/fmt-patchJunio C Hamano2006-06-027-101/+152
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ds/doc: Update documentation for git-format-patch sha1_file: avoid re-preparing duplicate packs handle concurrent pruning of packed objects http: prevent segfault during curl handle reuse Remove possible segfault in http-fetch. gitk: show_error fix [PATCH] gitk: start-up bugfix [PATCH] gitk: Replace "git-" commands with "git " [PATCH] gitk: Display commit messages with word wrap gitk: Fix bug where page-up/down wouldn't always work properly gitk: Fix display of "(...)" for parents/children we haven't drawn send-email: only 'require' instead of 'use' Net::SMTP Allow multiple -m options to git-commit.
| | * | Update documentation for git-format-patchDennis Stosberg2006-06-021-34/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [jc: adjusted for recently resurrected features] Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | format-patch: resurrect extra headers from configJohannes Schindelin2006-06-023-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once again, if you have [format] headers = "Origamization: EvilEmpire\n" format-patch will add these headers just after the "Subject:" line. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | format-patch --signoffJunio C Hamano2006-05-313-2/+52
| | |/ | |/| | | | | | | | | | | | | This resurrects --signoff option to format-patch. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Documentation: Spelling fixesHorst H. von Brand2006-06-0328-47/+47
| | | | | | | | | | | | | | | Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Builtin git-rev-parse.Christian Couder2006-06-034-6/+8
| | | | | | | | | | | | | | | Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | fetch: do not report "same" unless -verbose.Junio C Hamano2006-06-031-1/+4
| |/ |/| | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | sha1_file: avoid re-preparing duplicate packsJeff King2006-06-021-0/+6
| | | | | | | | | | | | | | | | When adding packs, skip the pack if we already have it in the packed_git list. This might happen if we are re-preparing our packs because of a missing object. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | handle concurrent pruning of packed objectsJeff King2006-06-021-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch causes read_sha1_file and sha1_object_info to re-examine the list of packs if an object cannot be found. It works by re-running prepare_packed_git() after an object fails to be found. It does not attempt to clean up the old pack list. Old packs which are in use can continue to be used (until unused by lru selection). New packs are placed at the front of the list and will thus be examined before old packs. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'nh/http'Junio C Hamano2006-06-022-5/+8
|\ \ | | | | | | | | | | | | | | | * nh/http: http: prevent segfault during curl handle reuse Remove possible segfault in http-fetch.
| * | http: prevent segfault during curl handle reuseNick Hengeveld2006-05-311-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a curl handle is configured with special options, they may reference information that is freed after the request is complete which can cause a segfault if the curl handle is reused for a different type of request. This patch resets these options to a safe state when a transfer slot is assigned to a new request. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Remove possible segfault in http-fetch.Sean2006-05-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Free the curl string lists after running http_cleanup to avoid an occasional segfault in the curl library. Seems to only occur if the website returns a 405 error. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2006-05-311-48/+54
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/gitk/gitk: gitk: show_error fix [PATCH] gitk: start-up bugfix [PATCH] gitk: Replace "git-" commands with "git " [PATCH] gitk: Display commit messages with word wrap gitk: Fix bug where page-up/down wouldn't always work properly gitk: Fix display of "(...)" for parents/children we haven't drawn
| * | | gitk: show_error fixPaul Mackerras2006-05-261-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug noted by Junio C Hamano: show_error can be passed "." (root window) as its $w argument, but appending ".m" and ".ok" results in creating "..m" and "..ok" as window paths, which were invalid. This fixes it in a slightly different way from Junio's patch, though. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] gitk: start-up bugfixJunio C Hamano2006-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code to extract a message part from the error message was not passing the error message to [string range], and resulted in the show_error not getting called. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] gitk: Replace "git-" commands with "git "Timo Hirvonen2006-05-261-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | git-* commands work only if gitexecdir is in PATH. Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] gitk: Display commit messages with word wrapSergey Vlasov2006-05-201-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some people put very long strings into commit messages, which then become invisible in gitk (word wrapping in the commit details window is turned off, and there is no horizontal scroll bar). Enabling word wrap for just the commit message looks much better. Wrapping is controlled by the "wrapcomment" option in ~/.gitk. By default this option is set to "none", which disables wrapping; setting it to "word" enables word wrap for commit messages. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | gitk: Fix bug where page-up/down wouldn't always work properlyPaul Mackerras2006-05-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user pressed page up or page down and the new page wasn't already drawn, we failed to select the line we wanted in the new page. This fixes it. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | gitk: Fix display of "(...)" for parents/children we haven't drawnPaul Mackerras2006-05-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the commit details window, we were displaying "(...)" for the headlines of parents and children that haven't been drawn, without making any attempt to get those headlines. This adds a call to getcommit to commit_descriptor so we get those headlines. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | | send-email: only 'require' instead of 'use' Net::SMTPJohannes Schindelin2006-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was proposed by Eric Wong and fixes the test. (Of course, git-send-email does not work, if there is no Net::SMTP here, but it will say what is wrong when you actually try to use send-email.) Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Allow multiple -m options to git-commit.Shawn Pearce2006-05-311-7/+30
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I find it very convenient to be able to supply multiple paragraphs of text on the command line with a single git-commit call. This change permits multiple -m/--message type options to be supplied to git-commit with each message being added as its own paragraph of text in the commit message. The -m option is still not permitted with -c/-C/-F nor are multiple occurrences of these options permitted. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Improved pack format documentation.Shawn Pearce2006-05-301-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | While trying to implement a pack reader in Java I was mislead by some facts listed in this documentation as well as found a few details to be missing about the pack header. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | git_exec_path, execv_git_cmd: ignore empty environment variablesDmitry V. Levin2006-05-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Ignoring empty environment variables is good common practice. Ignoring --exec-path with empty argument won't harm, too: if user means current directory, there is a "--exec-path=." Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | execv_git_cmd: Fix stack buffer overflow.Dmitry V. Levin2006-05-301-9/+23
| | | | | | | | | | | | | | | Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Fixed Cygwin CR-munging problem in mailsplitSalikh Zakirov2006-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not open mailbox file as fopen(..., "rt") as this strips CR characters from the diff, thus breaking the patch context for changes in CRLF files. Signed-off-by: Salikh Zakirov <Salikh.Zakirov@Intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'ew/tests'Junio C Hamano2006-05-305-68/+82
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ew/tests: t6000lib: workaround a possible dash bug t5500-fetch-pack: remove local (bashism) usage. tests: Remove heredoc usage inside quotes t3300-funny-names: shell portability fixes
| * | | t6000lib: workaround a possible dash bugEric Wong2006-05-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pdksh doesn't need this patch, of course bash works fine since that what most users use. Normally, 'var=val command' seems to work fine with dash, but perhaps there's something weird going on with "$@". dash is pretty widespread, so it'll be good to support this even though it does seem like a bug in dash. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | t5500-fetch-pack: remove local (bashism) usage.Eric Wong2006-05-251-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | None of the variables seem to conflict, so local was unnecessary. Also replaced ${var:pos:len} with the sed equivalent. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | tests: Remove heredoc usage inside quotesEric Wong2006-05-252-34/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of heredoc inside quoted strings doesn't seem to be supported by dash. pdksh seems to handle it fine, however. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | t3300-funny-names: shell portability fixesEric Wong2006-05-251-18/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | echo isn't remotely standardized for handling backslashes, so cat + heredoc seems better Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | send-email: do not pass bogus address to local sendmail binaryJunio C Hamano2006-05-302-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes t9001 test happy. Also fixes the warning on uninitialized $references variable again. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Add a basic test case for git send-email, and fix some real bugs discovered.Ryan Anderson2006-05-291-0/+34
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ryan Anderson <rda@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Fix a bug in email extraction used in git-send-email.Ryan Anderson2006-05-291-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (Also, kill off an accidentally created warning.) Signed-off-by: Ryan Anderson <rda@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Add support for --bcc to git-send-email.Ryan Anderson2006-05-291-2/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ryan Anderson <rda@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | git-send-email: Add References: headers to emails, in addition to In-Reply-To:Ryan Anderson2006-05-291-2/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ryan Anderson <rda@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | git-clean fails on files beginning with a dashDennis Stosberg2006-05-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reproducible with: $ git init-db $ echo "some text" >-file $ git clean Removing -file rm: invalid option -- l Try `rm --help' for more information. Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | git-svn: remove assertion that broke with older versions of svnEric Wong2006-05-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn < 1.3.x would display changes to keywords lines as modified if they aren't expanded in the working copy. We already check for changes against the git tree here, so checking against the svn one is probably excessive. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | git-svn: t0001: workaround a heredoc bug in old versions of dashEric Wong2006-05-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dash installed on my Debian Sarge boxes don't seem to like <<'' as a heredoc starter. Recent versions of dash do not need this fix. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Documentation: fix a tutorial-2 typoJ. Bruce Fields2006-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a typo. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Documentation: retitle the git-core tutorialJ. Bruce Fields2006-05-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give the git-core tutorial a name that better reflects its intended audience. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | documentation: add brief mention of cat-file to tutorial part IJ. Bruce Fields2006-05-291-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'd rather avoid git cat-file so early on, but the git-cat-file -p old-commit:/path/to/file trick is too useful.... Also fix a nearby typo while we're at it. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | documentation: mention gitk font adjustment in tutorialJ. Bruce Fields2006-05-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kind of silly, but the font I get by default in gitk makes it mostly unusable for me, so this is the first thing I'd want to know about. (But maybe there's a better suggestion than just Ctrl-='ing until satisfied.) Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Fix some documentation typoesHorst von Brand2006-05-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some typoes in Documentation/everyday.txt Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Make git-diff-tree indicate when it flushesPaul Mackerras2006-05-291-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are times when gitk needs to know that the commits it has sent to git-diff-tree --stdin did not match, and it needs to know in a timely fashion even if none of them match. At the moment, git-diff-tree outputs nothing for non-matching commits, so it is impossible for gitk to distinguish between git-diff-tree being slow and git-diff-tree saying no. This makes git-diff-tree flush its output and echo back the input line when it is not a valid-looking object name. Gitk, or other users of git-diff-tree --stdin, can use a blank line or any other "marker line" to indicate that git-diff-tree has processed all the commits on its input up to the echoed back marker line, and any commits that have not been output do not match. [jc: re-done after a couple of back-and-forth discussion on the list.] Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Remove unnecessary output from t3600-rm.Shawn Pearce2006-05-291-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the setup commands into test_expect_success blocks so their output is hidden unless -v is used. This makes the test suite look a little cleaner when the rm test-file setup step fails (and was expected to fail for most cases). Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Merge branch 'lt/apply'Junio C Hamano2006-05-282-0/+70
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lt/apply: apply: force matching at the beginning. Add a test-case for git-apply trying to add an ending line apply: treat EOF as proper context.
View Lorry Controller Status