718258e256b74622aa55f5ee0cb9cff4cce6bf9f fdedb422b53bd7e08db70ee41bd7ecc831d583c5 R. Tyler Ballance tyler@slide.com http://github.com/rtyler/slide-git/commit/ef6237a05f7307928f5b1766cd541aeeffdf8b7a ef6237a05f7307928f5b1766cd541aeeffdf8b7a 2008-12-20T17:52:42-08:00 2008-12-20T17:52:42-08:00 Merge branch 'slide_v1.6.0.5' into slide_v1.6.0.6 705cc3422a2e79df8631894911f68074ddf52129 R. Tyler Ballance tyler@slide.com 88fbf67b78c7bbe6c94150e7cd05f9398b571c48 438d2991eaa17549df67929cd4558d65840c37d7 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/718258e256b74622aa55f5ee0cb9cff4cce6bf9f 718258e256b74622aa55f5ee0cb9cff4cce6bf9f 2008-12-19T19:27:35-08:00 2008-12-19T19:27:06-08:00 GIT 1.6.0.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> be359d31387fa335ceb3ad116c229643d492878d Junio C Hamano gitster@pobox.com 4e46a8d62c551e11e21bd04e059e9ae3cdcfd029 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/88fbf67b78c7bbe6c94150e7cd05f9398b571c48 88fbf67b78c7bbe6c94150e7cd05f9398b571c48 2008-12-19T19:25:06-08:00 2008-12-19T14:41:21-08:00 fast-import: make tagger information optional Even though newer Porcelain tools always record the tagger information when creating new tags, export/import pair should be able to faithfully reproduce ancient tag objects that lack tagger information. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> 6ac233c4cb1a6f3a7f49a8a246767f43f7a36299 Junio C Hamano gitster@pobox.com 672752470c85c8dc3dd9b49f72063a99f8475b4a Johannes Schindelin Johannes.Schindelin@gmx.de http://github.com/rtyler/slide-git/commit/4e46a8d62c551e11e21bd04e059e9ae3cdcfd029 4e46a8d62c551e11e21bd04e059e9ae3cdcfd029 2008-12-19T19:11:27-08:00 2008-12-19T16:00:27-08:00 fast-export: deal with tag objects that do not have a tagger When no tagger was found (old Git produced tags like this), no "tagger" line is printed (but this is incompatible with the current git fast-import). Alternatively, you can pass the option --fake-missing-tagger, forcing fast-export to fake a tagger Unspecified Tagger <no-tagger> with a tag date of the beginning of (Unix) time in the case of a missing tagger, so that fast-import is still able to import the result. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 8e5fc4e903784cf071b7539efd73304aba2c0f3e Junio C Hamano gitster@pobox.com ce2c3ebbc5a66e0370b3ab5b5611c2c390ddd6c0 Miklos Vajna vmiklos@frugalware.org http://github.com/rtyler/slide-git/commit/672752470c85c8dc3dd9b49f72063a99f8475b4a 672752470c85c8dc3dd9b49f72063a99f8475b4a 2008-12-19T19:11:20-08:00 2008-12-19T16:52:17-08:00 SubmittingPatches: mention the usage of real name in Signed-off-by: lines Especially with something that is supposed to hopefully have some legal value down the line if somebody starts making noises, it really would be nice to have a real person to associate things with. Suggest this in the SubmittingPatches document. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 84ebaa62772c1182102fbad73395aa05b5e69fe5 Junio C Hamano gitster@pobox.com 0e73b3ee6ca95e1db2fe801d2b8544f4c27991df David Aguilar davvid@gmail.com http://github.com/rtyler/slide-git/commit/ce2c3ebbc5a66e0370b3ab5b5611c2c390ddd6c0 ce2c3ebbc5a66e0370b3ab5b5611c2c390ddd6c0 2008-12-19T19:10:58-08:00 2008-12-19T17:01:01-08:00 git-mergetool: properly handle "git mergetool -- filename" Like many git commands, git-mergetool allows "--" to signal the end of option processing. This adds a missing "shift" statement so that this is correctly handled. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 11c6f880579d1d7c3aacd4185b76b47b128e652d Junio C Hamano gitster@pobox.com 04c8ce9c1c803a8dc0f3728f57550f9bc9e605c2 Wu Fengguang fengguang.wu@intel.com http://github.com/rtyler/slide-git/commit/0e73b3ee6ca95e1db2fe801d2b8544f4c27991df 0e73b3ee6ca95e1db2fe801d2b8544f4c27991df 2008-12-19T19:10:48-08:00 2008-12-19T00:10:10-08:00 git-send-email: handle email address with quoted comma Correctly handle email addresses containing quoted commas, e.g. "Zhu, Yi" <yi.zhu@intel.com>, "Li, Shaohua" <shaohua.li@intel.com> The commas inside the double quotes are not separators. Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 5f67dc706abbdc18295a0a35f82567251ca2b21e Junio C Hamano gitster@pobox.com 87c8a56e4f71cc7e22c16caa4adc2ae17f6aa93d Markus Heidelberg markus.heidelberg@web.de http://github.com/rtyler/slide-git/commit/04c8ce9c1c803a8dc0f3728f57550f9bc9e605c2 04c8ce9c1c803a8dc0f3728f57550f9bc9e605c2 2008-12-19T19:10:46-08:00 2008-12-19T04:14:18-08:00 Documentation: fix typos, grammar, asciidoc syntax Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> f2756934c58c5f1e0e94709009847894af512b9c Junio C Hamano gitster@pobox.com 21926fe885aa6579f7aa0e89fcb6a9064f8aa516 f23ffbe890d36e277f02d4a84c2b52de3a4e3173 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/438d2991eaa17549df67929cd4558d65840c37d7 438d2991eaa17549df67929cd4558d65840c37d7 2008-12-16T22:13:36-08:00 2008-12-16T22:13:36-08:00 GIT 1.5.6.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> d0744a8836cbafd5037d08d2f2853dffe247d662 Junio C Hamano gitster@pobox.com 006f31d77f3dd5f813557c2839b39b2aaa22b925 34b146c0f444fc9f83bea3215bd0cd546fc57c33 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/f23ffbe890d36e277f02d4a84c2b52de3a4e3173 f23ffbe890d36e277f02d4a84c2b52de3a4e3173 2008-12-16T22:08:28-08:00 2008-12-16T22:08:22-08:00 GIT 1.5.5.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> 281348e9bd1853df211e24f4a47c47985ef696fc Junio C Hamano gitster@pobox.com dfff4b7aa42de7e7d58caeebe2c6128449f09b76 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/34b146c0f444fc9f83bea3215bd0cd546fc57c33 34b146c0f444fc9f83bea3215bd0cd546fc57c33 2008-12-16T22:06:47-08:00 2008-12-16T22:03:29-08:00 GIT 1.5.4.7 Signed-off-by: Junio C Hamano <gitster@pobox.com> dc579dd877b59ccc7f70e42390291bfbe701cbd5 Junio C Hamano gitster@pobox.com 872354dcb3ce5f34f7ddb12d2c89d26a1ea4daf0 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/dfff4b7aa42de7e7d58caeebe2c6128449f09b76 dfff4b7aa42de7e7d58caeebe2c6128449f09b76 2008-12-16T21:54:44-08:00 2008-12-16T19:42:02-08:00 gitweb: do not run "git diff" that is Porcelain Jakub says that legacy-style URI to view two blob differences are never generated since 1.4.3. This codepath runs "git diff" Porcelain from the gitweb, which is a no-no. It can trigger diff.external command that is specified in the configuration file of the repository being viewed. This patch applies to v1.5.4 and later. Signed-off-by: Junio C Hamano <gitster@pobox.com> 4bf8fbc8a9bffd10627fceb57cc972e4cbbdd8f8 Junio C Hamano gitster@pobox.com a8335024c294db470e16e9df3aaa346bfcfbeacb Johannes Schindelin Johannes.Schindelin@gmx.de http://github.com/rtyler/slide-git/commit/87c8a56e4f71cc7e22c16caa4adc2ae17f6aa93d 87c8a56e4f71cc7e22c16caa4adc2ae17f6aa93d 2008-12-15T23:04:48-08:00 2008-12-15T13:11:40-08:00 fast-import: close pack before unlinking it This is sort of a companion patch to 4723ee9(Close files opened by lock_file() before unlinking.): on Windows, you cannot delete what is still open. This makes test 9300-fast-import pass on Windows for me; quite a few fast-imports leave temporary packs until the test "blank lines not necessary after other commands" actually tests for the number of files in .git/objects/pack/, which has a few temporary packs now. I guess that 8b4eb6b(Do not perform cross-directory renames when creating packs) was "responsible" for the breakage. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 0b58d8421a6f83c88b469b761abe794a4e1d148d Junio C Hamano gitster@pobox.com d2dadfe890b5da6f65fe061a414b6ec67c5efe9c Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/a8335024c294db470e16e9df3aaa346bfcfbeacb a8335024c294db470e16e9df3aaa346bfcfbeacb 2008-12-15T01:37:15-08:00 2008-12-15T00:33:34-08:00 pager: do not dup2 stderr if it is already redirected An earlier commit 61b8050 (sending errors to stdout under $PAGER, 2008-02-16) avoided losing the error messages that are sent to the standard error when $PAGER is in effect by dup2'ing fd 2 to the pager. his way, showing a tag object that points to a bad object: $ git show tag-foo would give the error message to the pager. However, it was not quite right if the user did: $ git show 2>error.log tag-foo i.e. use the pager but store the errors in a separate file. Signed-off-by: Junio C Hamano <gitster@pobox.com> 1fb2b119ec62cb4606294e4a509c3d271b3c53e0 Junio C Hamano gitster@pobox.com 544ddb045a4bd49da9ffc1d9da80bdc0d71b2518 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/d2dadfe890b5da6f65fe061a414b6ec67c5efe9c d2dadfe890b5da6f65fe061a414b6ec67c5efe9c 2008-12-15T01:29:44-08:00 2008-12-15T00:36:56-08:00 git-show: do not segfault when showing a bad tag When a tag points at a bad or nonexistent object, we should diagnose the breakage and exit. An earlier commit 4f3dcc2 (Fix 'git show' on signed tag of signed tag of commit, 2008-07-01) lost this check and made it segfault instead; not good. This fixes it. Signed-off-by: Junio C Hamano <gitster@pobox.com> 494ca607f5ff4dd4135e84b4513567fcb79f4a0d Junio C Hamano gitster@pobox.com 04d39759373e5de017e7c17ef4b762ac5ad3afcc Jim Meyering jim@meyering.net http://github.com/rtyler/slide-git/commit/544ddb045a4bd49da9ffc1d9da80bdc0d71b2518 544ddb045a4bd49da9ffc1d9da80bdc0d71b2518 2008-12-12T20:39:41-08:00 2008-12-12T01:00:41-08:00 git-config.txt: fix a typo Signed-off-by: Junio C Hamano <gitster@pobox.com> 3a0be0065409a0ab38bc52239836d409b4a4464c Junio C Hamano gitster@pobox.com c74faea19e39ca933492f697596310397175c329 Linus Torvalds torvalds@linux-foundation.org http://github.com/rtyler/slide-git/commit/04d39759373e5de017e7c17ef4b762ac5ad3afcc 04d39759373e5de017e7c17ef4b762ac5ad3afcc 2008-12-11T00:09:48-08:00 2008-12-10T19:44:37-08:00 fsck: reduce stack footprint The logic to mark all objects that are reachable from tips of refs were implemented as a set of recursive functions. In a repository with a deep enough history, this can easily eat up all the available stack space. Restructure the code to require less stackspace by using an object array to keep track of the objects that still need to be processed. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 60bdd2419073b9ed60473a873b1d66ff4f8b632d Junio C Hamano gitster@pobox.com aa971cb9bf4105eefb435b9e6f282f019529c35f Nicolas Pitre nico@cam.org http://github.com/rtyler/slide-git/commit/c74faea19e39ca933492f697596310397175c329 c74faea19e39ca933492f697596310397175c329 2008-12-10T17:56:05-08:00 2008-12-09T11:26:52-08:00 make sure packs to be replaced are closed beforehand Especially on Windows where an opened file cannot be replaced, make sure pack-objects always close packs it is about to replace. Even on non Windows systems, this could save potential bad results if ever objects were to be read from the new pack file using offset from the old index. This should fix t5303 on Windows. Signed-off-by: Nicolas Pitre <nico@cam.org> Tested-by: Johannes Sixt <j6t@kdbg.org> (MinGW) Signed-off-by: Junio C Hamano <gitster@pobox.com> 8d98539f02bf7bcc82c43f466feae01dbf0de9bc Junio C Hamano gitster@pobox.com 553589f7823db530d03b49db42251fbea624041f Junio C Hamano junio@pobox.com http://github.com/rtyler/slide-git/commit/aa971cb9bf4105eefb435b9e6f282f019529c35f aa971cb9bf4105eefb435b9e6f282f019529c35f 2008-12-09T19:06:15-08:00 2008-12-07T18:38:46-08:00 work around Python warnings from AsciiDoc It appears that a reference to an anchor defined as [[anchor-name]] from another place using <<anchor-name>> syntax, when the anchor name contains a string "-with-" in its name, triggers these warnings from Python interpreter. asciidoc -b docbook -d book user-manual.txt <string>:1: Warning: 'with' will become a reserved keyword in Python 2.6 <string>:1: Warning: 'with' will become a reserved keyword in Python 2.6 <string>:1: Warning: 'with' will become a reserved keyword in Python 2.6 <string>:1: Warning: 'with' will become a reserved keyword in Python 2.6 There currently is no reference to "Finding comments with given content", but for consistency and for futureproofing, the anchor is also updated as the other ones that are actually used and trigger these warnings. Signed-off-by: Junio C Hamano <junio@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2850f1c3006acb6a2365934e6ea2d4c2a6257402 Junio C Hamano gitster@pobox.com 48290d62f26f95ed2d4b784c415cc3ada1c1773a 6db72d2f0b153af351154d632d880a82bd8d84bd R. Tyler Ballance tyler@slide.com http://github.com/rtyler/slide-git/commit/fdedb422b53bd7e08db70ee41bd7ecc831d583c5 fdedb422b53bd7e08db70ee41bd7ecc831d583c5 2008-12-08T23:31:38-08:00 2008-12-08T23:31:38-08:00 Merge branch 'slide_v1.6.0.4' into slide_v1.6.0.5 108a0d13642482d0608d402a5fbc277776c26d4c R. Tyler Ballance tyler@slide.com 1c2ed59de2d14ad6ee9daa4d4f7254297d9a3830 R. Tyler Ballance tyler@slide.com http://github.com/rtyler/slide-git/commit/48290d62f26f95ed2d4b784c415cc3ada1c1773a 48290d62f26f95ed2d4b784c415cc3ada1c1773a 2008-12-08T23:31:32-08:00 2008-12-08T23:26:47-08:00 Apply the patch to solve this issue, courtesy of jast in irc.freenode.net#git xdev3 (master)% git pull . master-topfriends From . * branch master-topfriends -> FETCH_HEAD git push orerror: failed to read delta base object 99b60fe040beed0189b03c33d1c750e864356b33 at offset 1376252850 from .git/objects/pack/pack-f7eb06e39f01b528c1d1a2c413ac51b31b8515aa.pack error: failed to read object 579269a0b9ab0694fc1add3c0a83e4329b514d15 at offset 1376253518 from .git/objects/pack/pack-f7eb06e39f01b528c1d1a2c413ac51b31b8515aa.pack fatal: object 579269a0b9ab0694fc1add3c0a83e4329b514d15 is corrupted Merge with strategy recursive failed. xdev3 (master)% Signed-off-by: R. Tyler Ballance <tyler@slide.com> 34fcfc90beaeb169848ed5c83bcd68f56b982322 R. Tyler Ballance tyler@slide.com 1c2ed59de2d14ad6ee9daa4d4f7254297d9a3830 Deskin Miller deskinm@umich.edu http://github.com/rtyler/slide-git/commit/553589f7823db530d03b49db42251fbea624041f 553589f7823db530d03b49db42251fbea624041f 2008-12-08T16:29:34-08:00 2008-12-08T05:31:31-08:00 git-svn: Make following parents atomic find_parent_branch generates branch@rev type branches when one has to look back through SVN history to properly get the history for a branch copied from somewhere not already being tracked by git-svn. If in the process of fetching this history, git-svn is interrupted, then when one fetches again, it will use whatever was last fetched as the parent commit and fail to fetch any more history which it didn't get to before being terminated. This is especially troubling in that different git-svn copies of the same SVN repository can end up with different commit sha1s, incorrectly showing the history as divergent and precluding easy collaboration using git push and fetch. To fix this, when we initialise the Git::SVN object $gs to search for and perhaps fetch history, we check if there are any commits in SVN in the range between the current revision $gs is at, and the top revision for which we were asked to fill history. If there are commits we're missing in that range, we continue the fetch from the current revision to the top, properly getting all history before using it as the parent for the branch we're trying to create. Signed-off-by: Deskin Miller <deskinm@umich.edu> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> c99bcfc4a98d0e021580636cf3f342429649e529 Junio C Hamano gitster@pobox.com dbc2fb6b841dd3a72c52a5a161e2362a26fc65f5 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/1c2ed59de2d14ad6ee9daa4d4f7254297d9a3830 1c2ed59de2d14ad6ee9daa4d4f7254297d9a3830 2008-12-07T15:11:54-08:00 2008-12-07T03:03:16-08:00 GIT 1.6.0.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> ec05f0850e13f73a6a9cfb8cc7f1b36ff0f8b411 Junio C Hamano gitster@pobox.com 3927bbe9a4d4033551dea39ac1abb9cdc45d822c Matt McCutchen matt@mattmccutchen.net http://github.com/rtyler/slide-git/commit/dbc2fb6b841dd3a72c52a5a161e2362a26fc65f5 dbc2fb6b841dd3a72c52a5a161e2362a26fc65f5 2008-12-07T14:57:57-08:00 2008-10-10T18:56:15-07:00 "git diff <tree>{3,}": do not reverse order of arguments According to the message of commit 0fe7c1de16f71312e6adac4b85bddf0d62a47168, "git diff" with three or more trees expects the merged tree first followed by the parents, in order. However, this command reversed the order of its arguments, resulting in confusing diffs. A comment /* Again, the revs are all reverse */ suggested there was a reason for this, but I can't figure out the reason, so I removed the reversal of the arguments. Test case included. Signed-off-by: Matt McCutchen <matt@mattmccutchen.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> 8171a2c869f6b1ef3a8a849fab1af952874d77de Junio C Hamano gitster@pobox.com bcc6a833032e0830195c1de1b834006a1d0156fe Jeff King peff@peff.net http://github.com/rtyler/slide-git/commit/3927bbe9a4d4033551dea39ac1abb9cdc45d822c 3927bbe9a4d4033551dea39ac1abb9cdc45d822c 2008-12-07T02:53:45-08:00 2008-12-06T11:40:34-08:00 tag: delete TAG_EDITMSG only on successful tag The user may put some effort into writing an annotated tag message. When the tagging process later fails (which can happen fairly easily, since it may be dependent on gpg being correctly configured and used), there is no record left on disk of the tag message. Instead, let's keep the TAG_EDITMSG file around until we are sure the tag has been created successfully. If we die because of an error, the user can recover their text from that file. Leaving the file in place causes no conflicts; it will be silently overwritten by the next annotated tag creation. This matches the behavior of COMMIT_EDITMSG, which stays around in case of error. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 9d8b8febf7e195e1cf76c704419c00b1b4e49da1 Junio C Hamano gitster@pobox.com e4a80ecf40c9651741def7c4f0b2ca56b42af1a8 Jakub Narebski jnareb@gmail.com http://github.com/rtyler/slide-git/commit/bcc6a833032e0830195c1de1b834006a1d0156fe bcc6a833032e0830195c1de1b834006a1d0156fe 2008-12-07T02:52:37-08:00 2008-12-07T01:36:36-08:00 gitweb: Make project specific override for 'grep' feature work The 'grep' feature was marked in the comments as having project specific config, but it lacked 'sub' key required for it to work. Kind-of-Noticed-by: Matt Kraai <kraai@ftbfs.org> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13280146e44173b0b01a0d11b0021d4460d09d07 Junio C Hamano gitster@pobox.com d551bbaf3af1fad947c704bdeb9cf664b34e38c6 Miklos Vajna vmiklos@frugalware.org http://github.com/rtyler/slide-git/commit/e4a80ecf40c9651741def7c4f0b2ca56b42af1a8 e4a80ecf40c9651741def7c4f0b2ca56b42af1a8 2008-12-07T02:41:55-08:00 2008-12-06T16:45:37-08:00 http.c: use 'git_config_string' to get 'curl_http_proxy' Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 6655cbd2e45a26c1d0bd0cd1f03deeb572b9d2f6 Junio C Hamano gitster@pobox.com 2ab4de57ea2c423fe8abae5278507106972ef1fe Thomas Rast trast@student.ethz.ch http://github.com/rtyler/slide-git/commit/d551bbaf3af1fad947c704bdeb9cf664b34e38c6 d551bbaf3af1fad947c704bdeb9cf664b34e38c6 2008-12-07T02:41:45-08:00 2008-12-06T12:50:09-08:00 fetch-pack: Avoid memcpy() with src==dst memcpy() may only be used for disjoint memory areas, but when invoked from cmd_fetch_pack(), we have my_args == &args. (The argument cannot be removed entirely because transport.c invokes with its own variable.) Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> ed32d59e4e83df723e6b9fdd973608cf7de87d78 Junio C Hamano gitster@pobox.com 733070bea9ce28d557f0b0950acc05b3fe6ff6c6 0b38227f283e208866d3e2ac85bcd947a71f1b17 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/2ab4de57ea2c423fe8abae5278507106972ef1fe 2ab4de57ea2c423fe8abae5278507106972ef1fe 2008-12-02T23:47:25-08:00 2008-12-02T23:47:25-08:00 Merge branch 'jk/maint-commit-v-strip' into maint * jk/maint-commit-v-strip: commit: Fix stripping of patch in verbose mode. 9828a4bdbebae0e83ec9d509b4192d8cdf7276d9 Junio C Hamano gitster@pobox.com 0fd9d7e66deb7071da2a568b96c94f94ee890908 Davide Libenzi davidel@xmailserver.org http://github.com/rtyler/slide-git/commit/733070bea9ce28d557f0b0950acc05b3fe6ff6c6 733070bea9ce28d557f0b0950acc05b3fe6ff6c6 2008-12-02T23:45:37-08:00 2008-11-07T21:24:33-08:00 xdiff: give up scanning similar lines early In a corner case of large files whose lines do not match uniquely, the loop to eliminate a line that matches multiple locations adjacent to a run of lines that do not uniquely match wasted too much cycles. Fix this by giving up early after scanning 100 lines in both direction. Signed-off-by: Junio C Hamano <gitster@pobox.com> 4bfc97b38f65e30f28ac296a392d1cf85b36313a Junio C Hamano gitster@pobox.com