2082a82f2ce593b1fcf3f8caede49645ffb597ce dbbd56f1031992593f129168006b6c2f8bae13ec Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/a930f33421e05ae92b20fcddf7fa3c32affc6e4a a930f33421e05ae92b20fcddf7fa3c32affc6e4a 2008-11-23T21:10:28-08:00 2008-11-23T21:10:28-08:00 Merge branch 'cr/remote-update-v' into pu * cr/remote-update-v: git-remote: add verbose mode to git remote update c7bb69de4f092d219053f89512c8744edca49775 Junio C Hamano gitster@pobox.com e974401fd5844012377be6fb219d88e80939b8d9 887bdbfa76c0ab2515aa5c1b2618430cb6720551 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/2082a82f2ce593b1fcf3f8caede49645ffb597ce 2082a82f2ce593b1fcf3f8caede49645ffb597ce 2008-11-23T21:10:25-08:00 2008-11-23T21:10:25-08:00 Merge branch 'mv/clone-strbuf' into pu * mv/clone-strbuf: builtin_clone: use strbuf in cmd_clone() builtin-clone: use strbuf in clone_local() and copy_or_link_directory() builtin-clone: use strbuf in guess_dir_name() builtin-clone: fix a memory leak in cmd_clone() 2552d9fbb5dffa100723b1a5d8590534ce4aae6d Junio C Hamano gitster@pobox.com bd1fc0ed1568965c03eafaadd6cc36e64820b455 777182b39f134acbec39a399c9c676d5b40c71be Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/e974401fd5844012377be6fb219d88e80939b8d9 e974401fd5844012377be6fb219d88e80939b8d9 2008-11-23T21:10:15-08:00 2008-11-23T21:10:15-08:00 Merge branch 'next' into pu * next: (30 commits) remove the unused files interpolate.c and interpolate.h daemon: deglobalize variable 'directory' daemon: inline fill_in_extra_table_entries() daemon: use strbuf_expand() instead of interpolate() merge-recursive: use strbuf_expand() instead of interpolate() add strbuf_expand_dict_cb(), a helper for simple cases fast-export: use an unsorted string list for extra_refs Add new testcase to show fast-export does not always exports all tags sha1_file: avoid bogus "file exists" error message Fix misleading wording for git-cherry-pick Fix t4030-diff-textconv.sh Fix handle leak in sha1_file/unpack_objects if there were damaged object data compat/mingw.c: Teach mingw_rename() to replace read-only files Document levenshtein.c Fix deletion of last character in levenshtein distance t2104: touch portability fix Revert earlier series for "kept packfile fix" pack-objects: extend --local to mean ignore non-local loose objects too sha1_file.c: split has_loose_object() into local and non-local counterparts t7700: demonstrate mishandling of loose objects in an alternate ODB ... e01498eb888f61f8aa1ab3609ccc63830d0a43a0 Junio C Hamano gitster@pobox.com 262f64fdc21a3203d0b02afe7cf6646ec334618a 2075ffb58e3a2d46d9e7606010f7f943f2295376 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/777182b39f134acbec39a399c9c676d5b40c71be 777182b39f134acbec39a399c9c676d5b40c71be 2008-11-23T21:09:42-08:00 2008-11-23T21:09:42-08:00 Merge branch 'mv/fast-export' into next * mv/fast-export: fast-export: use an unsorted string list for extra_refs Add new testcase to show fast-export does not always exports all tags d495e9e1e99240c4987542fc488342e152cdc35b Junio C Hamano gitster@pobox.com fe58f5e954f5cf22e6fb1e659a6edd144d7f9a24 850fb6ff81a151887043b7edd10681640b0e91c1 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/262f64fdc21a3203d0b02afe7cf6646ec334618a 262f64fdc21a3203d0b02afe7cf6646ec334618a 2008-11-23T21:09:02-08:00 2008-11-23T21:09:02-08:00 Merge branch 'st/levenshtein' into next * st/levenshtein: Document levenshtein.c Fix deletion of last character in levenshtein distance e747c901821c051759a78761e54a612dcc14477f Junio C Hamano gitster@pobox.com 1c0345ea5542b22524baf897cee3676ac82eb909 632f70178784291bd2974e07fdcd2b8e8608f252 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/fe58f5e954f5cf22e6fb1e659a6edd144d7f9a24 fe58f5e954f5cf22e6fb1e659a6edd144d7f9a24 2008-11-23T21:08:58-08:00 2008-11-23T21:08:58-08:00 Merge branch 'js/mingw-rename-fix' into next * js/mingw-rename-fix: compat/mingw.c: Teach mingw_rename() to replace read-only files 3ac1cfe054b94e422d5cf873e4b79b6a27e21305 Junio C Hamano gitster@pobox.com 991d8f0e19d4fd850af85439ae265a5fb03395b4 05689ce36ba78b474201d097ecc67913238b8d17 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/1c0345ea5542b22524baf897cee3676ac82eb909 1c0345ea5542b22524baf897cee3676ac82eb909 2008-11-23T21:08:54-08:00 2008-11-23T21:08:54-08:00 Merge branch 'nd/narrow' into next * nd/narrow: t2104: touch portability fix e49814eb85c87b366f1d5fa3f2d2d071d09e628a Junio C Hamano gitster@pobox.com c8e0b173dac84fe60431deeff28965dc502a304c ef3b38b445c183b2a07a6360de62908d312ade0f Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/991d8f0e19d4fd850af85439ae265a5fb03395b4 991d8f0e19d4fd850af85439ae265a5fb03395b4 2008-11-23T20:53:52-08:00 2008-11-23T20:53:52-08:00 Merge branch 'master' into next * master: sha1_file: avoid bogus "file exists" error message Fix misleading wording for git-cherry-pick Fix t4030-diff-textconv.sh Fix handle leak in sha1_file/unpack_objects if there were damaged object data cf99d8a8608647d417129400b7ae3569f62b081d Junio C Hamano gitster@pobox.com cbacbf4e55ba53d35567578d8c97fdea6b52e16a 37a7744ffe31af785571858f7341d588a6c66784 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/ef3b38b445c183b2a07a6360de62908d312ade0f ef3b38b445c183b2a07a6360de62908d312ade0f 2008-11-23T20:36:54-08:00 2008-11-23T20:36:54-08:00 Merge branch 'maint' * maint: Fix misleading wording for git-cherry-pick 81f3713d6be793cea0cd340237f2d2911d112207 Junio C Hamano gitster@pobox.com 4320efe4c10e0ba59007f3551000298f9d69c2ea 7de1950cb28cee7d6b1e9cdaf22f30ddcdc5bd01 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/c8e0b173dac84fe60431deeff28965dc502a304c c8e0b173dac84fe60431deeff28965dc502a304c 2008-11-23T20:09:46-08:00 2008-11-23T20:09:46-08:00 Merge branch 'rs/strbuf-expand' into next * rs/strbuf-expand: remove the unused files interpolate.c and interpolate.h daemon: deglobalize variable 'directory' daemon: inline fill_in_extra_table_entries() daemon: use strbuf_expand() instead of interpolate() merge-recursive: use strbuf_expand() instead of interpolate() add strbuf_expand_dict_cb(), a helper for simple cases 96187ced2625b6275403468aef1635d75ed5c167 Junio C Hamano gitster@pobox.com a47551c3828f81ec88d5b0b3d05887f1a7a4233a René Scharfe rene.scharfe@lsrfire.ath.cx http://github.com/rtyler/slide-git/commit/7de1950cb28cee7d6b1e9cdaf22f30ddcdc5bd01 7de1950cb28cee7d6b1e9cdaf22f30ddcdc5bd01 2008-11-23T19:56:57-08:00 2008-11-22T15:16:59-08:00 remove the unused files interpolate.c and interpolate.h Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> 3b5f07a64f65ad5085537fec3e8f214c1efb0b71 Junio C Hamano gitster@pobox.com d433ed0bb49b947e3bb05d6474cf328c75ffa57d René Scharfe rene.scharfe@lsrfire.ath.cx http://github.com/rtyler/slide-git/commit/a47551c3828f81ec88d5b0b3d05887f1a7a4233a a47551c3828f81ec88d5b0b3d05887f1a7a4233a 2008-11-23T19:56:36-08:00 2008-11-22T15:21:52-08:00 daemon: deglobalize variable 'directory' Remove the global variable 'directory' and pass it as a parameter of the two functions that use it instead, (almost) restoring their interface to how it was before 49ba83fb67d9e447b86953965ce5f949c6a93b81. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> c5f5c9ca22982993c7c3194debc2869b1d1c7085 Junio C Hamano gitster@pobox.com 9d7ca667466b9e1a8160d20cce7c06d09213ab6b René Scharfe rene.scharfe@lsrfire.ath.cx http://github.com/rtyler/slide-git/commit/d433ed0bb49b947e3bb05d6474cf328c75ffa57d d433ed0bb49b947e3bb05d6474cf328c75ffa57d 2008-11-23T19:56:26-08:00 2008-11-22T15:19:09-08:00 daemon: inline fill_in_extra_table_entries() Having fill_in_extra_table_entries() as a separate function has no advantage -- a function with no parameters and return values might as well be an anonymous block of code. Its name still refers to the table of interpolate() which has been removed earlier, so it's better to inline it at its only call site. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> 4a22b841c565d27ef336049b2adc996941edee5b Junio C Hamano gitster@pobox.com ced621b2c15c3d3dd65dd1d7eec984f8546a4673 René Scharfe rene.scharfe@lsrfire.ath.cx http://github.com/rtyler/slide-git/commit/9d7ca667466b9e1a8160d20cce7c06d09213ab6b 9d7ca667466b9e1a8160d20cce7c06d09213ab6b 2008-11-23T19:56:06-08:00 2008-11-22T15:15:01-08:00 daemon: use strbuf_expand() instead of interpolate() Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> 39d636bd5390728c40e2f1797bac0ca0661e8aa1 Junio C Hamano gitster@pobox.com 9b864e730bda0e028a85387fa568429724582f22 René Scharfe rene.scharfe@lsrfire.ath.cx http://github.com/rtyler/slide-git/commit/ced621b2c15c3d3dd65dd1d7eec984f8546a4673 ced621b2c15c3d3dd65dd1d7eec984f8546a4673 2008-11-23T19:55:52-08:00 2008-11-22T15:13:00-08:00 merge-recursive: use strbuf_expand() instead of interpolate() Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> 332d3af816ed077b58c81a5beb459655008fb740 Junio C Hamano gitster@pobox.com 6fc4a7e546d5e2b0ce545f73b5c1829887db2462 René Scharfe rene.scharfe@lsrfire.ath.cx http://github.com/rtyler/slide-git/commit/9b864e730bda0e028a85387fa568429724582f22 9b864e730bda0e028a85387fa568429724582f22 2008-11-23T19:55:47-08:00 2008-11-22T15:09:30-08:00 add strbuf_expand_dict_cb(), a helper for simple cases The new callback function strbuf_expand_dict_cb() can be used together with strbuf_expand() if there is only a small number of placeholders for static replacement texts. It expects its dictionary as an array of placeholder+value pairs as context parameter, terminated by an entry with the placeholder member set to NULL. The new helper is intended to aid converting the remaining calls of interpolate(). strbuf_expand() is smaller, more flexible and can be used to go faster than interpolate(), so it should replace the latter. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> d7c43e556e2e2d7955a39c83bcb9e5e4d147ef0e Junio C Hamano gitster@pobox.com 283b9532831fc0a86c40ac89e1e713b28dabb241 Johannes Schindelin Johannes.Schindelin@gmx.de http://github.com/rtyler/slide-git/commit/2075ffb58e3a2d46d9e7606010f7f943f2295376 2075ffb58e3a2d46d9e7606010f7f943f2295376 2008-11-23T19:54:51-08:00 2008-11-23T03:55:54-08:00 fast-export: use an unsorted string list for extra_refs The list extra_refs contains tags and the objects referenced by them, so that they can be handled at the end. When a tag references a commit, that commit is added to the list using the same name. Also, the function handle_tags_and_duplicates() relies on the order the items were added to extra_refs, so clearly we do not want to use a sorted list here. Noticed by Miklos Vajna. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Tested-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> b672545c29496147ad52e81da41917e75582c107 Junio C Hamano gitster@pobox.com 3eb91bfc0d2e0c8c67bd4ec62523deb849919dd9 Miklos Vajna vmiklos@frugalware.org http://github.com/rtyler/slide-git/commit/283b9532831fc0a86c40ac89e1e713b28dabb241 283b9532831fc0a86c40ac89e1e713b28dabb241 2008-11-23T19:54:24-08:00 2008-11-22T10:22:48-08:00 Add new testcase to show fast-export does not always exports all tags Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2a494cca03cc388b724ef6a38b86acc32dd9c379 Junio C Hamano gitster@pobox.com 797a51232c6e1741d0eace275cc03ab3c1e0c64d Miklos Vajna vmiklos@frugalware.org http://github.com/rtyler/slide-git/commit/887bdbfa76c0ab2515aa5c1b2618430cb6720551 887bdbfa76c0ab2515aa5c1b2618430cb6720551 2008-11-23T19:52:22-08:00 2008-11-20T16:45:01-08:00 builtin_clone: use strbuf in cmd_clone() Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 67429d5cd8e1e4326c8ff626941df3d40c282b7d Junio C Hamano gitster@pobox.com ea072035fe3c4f4f503b87a34c2d638e5b78c14b Miklos Vajna vmiklos@frugalware.org http://github.com/rtyler/slide-git/commit/797a51232c6e1741d0eace275cc03ab3c1e0c64d 797a51232c6e1741d0eace275cc03ab3c1e0c64d 2008-11-23T19:52:22-08:00 2008-11-20T16:45:00-08:00 builtin-clone: use strbuf in clone_local() and copy_or_link_directory() Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> c06219c39c44ac678ed91144842804cf83891bf4 Junio C Hamano gitster@pobox.com 476e21bdbcc8780813ac9cb7ad4b3d8fbd34da5f Miklos Vajna vmiklos@frugalware.org http://github.com/rtyler/slide-git/commit/ea072035fe3c4f4f503b87a34c2d638e5b78c14b ea072035fe3c4f4f503b87a34c2d638e5b78c14b 2008-11-23T19:52:22-08:00 2008-11-20T16:44:59-08:00 builtin-clone: use strbuf in guess_dir_name() Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> c2df4ad9b9773159b08bb21e1f917d265336723e Junio C Hamano gitster@pobox.com 6fc4a7e546d5e2b0ce545f73b5c1829887db2462 Miklos Vajna vmiklos@frugalware.org http://github.com/rtyler/slide-git/commit/476e21bdbcc8780813ac9cb7ad4b3d8fbd34da5f 476e21bdbcc8780813ac9cb7ad4b3d8fbd34da5f 2008-11-23T19:52:22-08:00 2008-11-20T16:44:58-08:00 builtin-clone: fix a memory leak in cmd_clone() Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> f31979efeb48204a45ef85d92b5fa7ed2eebb9eb Junio C Hamano gitster@pobox.com 3b91c30b763d972c5e133507ccc4b749dc2c6df5 Joey Hess joey@kitenet.net http://github.com/rtyler/slide-git/commit/cbacbf4e55ba53d35567578d8c97fdea6b52e16a cbacbf4e55ba53d35567578d8c97fdea6b52e16a 2008-11-23T19:44:19-08:00 2008-11-20T10:56:28-08:00 sha1_file: avoid bogus "file exists" error message This avoids the following misleading error message: error: unable to create temporary sha1 filename ./objects/15: File exists mkstemp can fail for many reasons, one of which, ENOENT, can occur if the directory for the temp file doesn't exist. create_tmpfile tried to handle this case by always trying to mkdir the directory, even if it already existed. This caused errno to be clobbered, so one cannot tell why mkstemp really failed, and it truncated the buffer to just the directory name, resulting in the strange error message shown above. Note that in both occasions that I've seen this failure, it has not been due to a missing directory, or bad permissions, but some other, unknown mkstemp failure mode that did not occur when I ran git again. This code could perhaps be made more robust by retrying mkstemp, in case it was a transient failure. Signed-off-by: Joey Hess <joey@kitenet.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 91dec4be3adffad7e665efb5d695ade2a9febd1c Junio C Hamano gitster@pobox.com 3eb91bfc0d2e0c8c67bd4ec62523deb849919dd9 Bryan Drewery bryan@shatow.net http://github.com/rtyler/slide-git/commit/37a7744ffe31af785571858f7341d588a6c66784 37a7744ffe31af785571858f7341d588a6c66784 2008-11-23T19:32:39-08:00 2008-11-19T21:11:42-08:00 Fix misleading wording for git-cherry-pick Documentation for -n implies that -x is normally used, however this is no longer true. Signed-off-by: Bryan Drewery <bryan@shatow.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 6ac7e3b302b3f1d13ba8b7bac4c535d894aeab41 Junio C Hamano gitster@pobox.com f755bb996ba0540d668104d0e2d4e03bb71b560b Alex Riesen raa.lkml@gmail.com http://github.com/rtyler/slide-git/commit/3b91c30b763d972c5e133507ccc4b749dc2c6df5 3b91c30b763d972c5e133507ccc4b749dc2c6df5 2008-11-23T19:32:07-08:00 2008-11-19T03:14:50-08:00 Fix t4030-diff-textconv.sh Avoid passing cygwin pathnames to Perl. Some Perls have problems using them Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 8e9e1cbe3f1f406d755b5eaae69f06ec20a175d5 Junio C Hamano gitster@pobox.com 6fc4a7e546d5e2b0ce545f73b5c1829887db2462 Alex Riesen raa.lkml@gmail.com http://github.com/rtyler/slide-git/commit/f755bb996ba0540d668104d0e2d4e03bb71b560b f755bb996ba0540d668104d0e2d4e03bb71b560b 2008-11-23T19:31:05-08:00 2008-11-19T03:14:05-08:00 Fix handle leak in sha1_file/unpack_objects if there were damaged object data In the case of bad packed object CRC, unuse_pack wasn't called after check_pack_crc which calls use_pack. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Acked-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> ed4e9a04d59f4c960f6c671e8fde9cd34a909ab0 Junio C Hamano gitster@pobox.com 3eb91bfc0d2e0c8c67bd4ec62523deb849919dd9 Johannes Sixt j6t@kdbg.org http://github.com/rtyler/slide-git/commit/632f70178784291bd2974e07fdcd2b8e8608f252 632f70178784291bd2974e07fdcd2b8e8608f252 2008-11-23T19:26:42-08:00 2008-11-19T08:25:27-08:00 compat/mingw.c: Teach mingw_rename() to replace read-only files On POSIX, rename() can replace files that are not writable. On Windows, however, read-only files cannot be replaced without additional efforts: We have to make the destination writable first. Since the situations where the destination is read-only are rare, we do not make the destination writable on every invocation, but only if the first try to rename a file failed with an "access denied" error. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> f47e781f5332c4cca45dde264a4b700e0b53a2ee Junio C Hamano gitster@pobox.com 13c6bcd49f8151438aa3302b8764c6f8d42441e2 Johannes Schindelin Johannes.Schindelin@gmx.de http://github.com/rtyler/slide-git/commit/850fb6ff81a151887043b7edd10681640b0e91c1 850fb6ff81a151887043b7edd10681640b0e91c1 2008-11-23T19:23:34-08:00 2008-11-20T05:27:27-08:00 Document levenshtein.c Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> aa18591bf1e3eff73b68030e00422c1a5d6b1bac Junio C Hamano gitster@pobox.com 6fc4a7e546d5e2b0ce545f73b5c1829887db2462 Samuel Tardieu sam@rfc1149.net http://github.com/rtyler/slide-git/commit/13c6bcd49f8151438aa3302b8764c6f8d42441e2 13c6bcd49f8151438aa3302b8764c6f8d42441e2 2008-11-23T19:23:33-08:00 2008-11-18T10:53:26-08:00 Fix deletion of last character in levenshtein distance Without this change, "git tags" will not suggest "git tag" (it will only suggest "git status"), and "git statusx" will not suggest anything. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> d9c510e443f19528b17d62127f84c9308d4391d3 Junio C Hamano gitster@pobox.com 85cbb129f5511e8d4141e4b36ab51cdefd1a3b60 Jeff King peff@peff.net http://github.com/rtyler/slide-git/commit/05689ce36ba78b474201d097ecc67913238b8d17 05689ce36ba78b474201d097ecc67913238b8d17 2008-11-23T19:11:07-08:00 2008-11-18T03:33:16-08:00 t2104: touch portability fix Some versions of touch support the syntax: touch [MMDDhhmm[yy]] file... which makes the first argument an optional time specification. They can get confused by touch 1 2 foo bar as they assume that '1' is a bogus time specification. This is broken, for example, with /bin/touch on Solaris 8. We can work this round by referring to file "1" as "./1". Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 9cfe381efb4e26bbc236e93c06a6bbe5b1bb1fd1 Junio C Hamano gitster@pobox.com