8eeca4d163a4f3365841c8c3e922b7318302ffcf Scott Chacon schacon@gmail.com http://github.com/schacon/git-source/commit/bdf81e0ae36dc468265fd6cc613e1a1139a57298 bdf81e0ae36dc468265fd6cc613e1a1139a57298 2008-04-02T10:01:03-07:00 2008-04-02T10:01:03-07:00 updated the logging to a local facility, so it can be more easily isolated aa6e230a06c02b32d4200fb93daa3535528c58b1 Scott Chacon schacon@gmail.com fff45c91cbd6619881d1089168d489a105e157ae Scott Chacon schacon@gmail.com http://github.com/schacon/git-source/commit/8eeca4d163a4f3365841c8c3e922b7318302ffcf 8eeca4d163a4f3365841c8c3e922b7318302ffcf 2008-04-02T09:53:45-07:00 2008-04-02T09:53:45-07:00 changed logging from file to syslogd 9242b4adb0074831bc7d5784e56e1fdd2234c83e Scott Chacon schacon@gmail.com aadd4efa715f56e0eac5ac459c8ff4933b56d4ce Scott Chacon schacon@gmail.com http://github.com/schacon/git-source/commit/fff45c91cbd6619881d1089168d489a105e157ae fff45c91cbd6619881d1089168d489a105e157ae 2008-04-02T07:14:56-07:00 2008-04-02T07:14:56-07:00 added logging mechanism to log when a fetch or a clone occurs. right now it is hard-coded to /tmp/git.log, which you will obviously need to change b269c5f6b84be151a9be7fd869d2827f78bcd48d Scott Chacon schacon@gmail.com eee8a1742bf51df33f0f6004774035f57253f944 Junio C Hamano gitster@pobox.com http://github.com/schacon/git-source/commit/aadd4efa715f56e0eac5ac459c8ff4933b56d4ce aadd4efa715f56e0eac5ac459c8ff4933b56d4ce 2008-01-07T22:41:43-08:00 2008-01-07T22:41:43-08:00 GIT 1.5.3.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> 470ec1b489d0cf383af21247ca7b5eb39efbae98 Junio C Hamano gitster@pobox.com f5530b8833bcaa423cd53d133d3de3fa0173fbf3 Eric Wong normalperson@yhbt.net http://github.com/schacon/git-source/commit/eee8a1742bf51df33f0f6004774035f57253f944 eee8a1742bf51df33f0f6004774035f57253f944 2008-01-07T16:25:31-08:00 2008-01-07T02:40:40-08:00 git-svn: clarify the "Ignoring error from SVN" piece I've heard of several users puzzled by this, and it sometimes it appears as if git-svn is doing nothing on slower connections and larger repositories. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 8e0fe761c15781d585cb01fe0bcf8eab61369b59 Junio C Hamano gitster@pobox.com 4f3d37035a7c735a3b69f962656819f4ff7e4927 Eric Wong normalperson@yhbt.net http://github.com/schacon/git-source/commit/f5530b8833bcaa423cd53d133d3de3fa0173fbf3 f5530b8833bcaa423cd53d133d3de3fa0173fbf3 2008-01-07T15:18:37-08:00 2007-11-11T23:37:42-08:00 git-svn: support for funky branch and project names over HTTP(S) SVN requires that paths be URI-escaped for HTTP(S) repositories. file:// and svn:// repositories do not need these rules. Additionally, accessing individual paths inside repositories (check_path() and get_log() do NOT require escapes to function and in fact it breaks things). Noticed-by: Michael J. Cohen <mjc@cruiseplanners.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 9a62fed470b1b8f28cc5e8eb76023562e3532f4c Junio C Hamano gitster@pobox.com 6851162adf29762cd121555645214468451a3111 Jeff King peff@peff.net http://github.com/schacon/git-source/commit/4f3d37035a7c735a3b69f962656819f4ff7e4927 4f3d37035a7c735a3b69f962656819f4ff7e4927 2007-12-17T15:58:05-08:00 2007-12-17T12:51:34-08:00 git-send-email: avoid duplicate message-ids We used to unconditionally add a message-id to the outgoing email without bothering to check if it already had one. Instead, let's use the existing one. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> b1a32f9b739c7a2ca9650acce12ec3d6e6566dca Junio C Hamano gitster@pobox.com 6281f394674bf2db861967da6c2215cfc3fc78af Jeff King peff@peff.net http://github.com/schacon/git-source/commit/6851162adf29762cd121555645214468451a3111 6851162adf29762cd121555645214468451a3111 2007-12-17T15:54:28-08:00 2007-12-17T04:43:59-08:00 clone: correctly report http_fetch errors The exit status from curl was accidentally lost by the 'case' statement. We need to explicitly save it so that $? doesn't get overwritten. This improves the error message when fetching from an http repository which has never had update-server-info run. Previously, it would fail to note the fetch error and produce multiple errors about the lack of origin branches. It now correctly suggests running git-update-server-info. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20d5fe7a5c710c7cbe26e09490bce68cccad9f19 Junio C Hamano gitster@pobox.com 8e7425da782cbdff4531d84e0ef4ec7bd3ae23d7 Jim Meyering jim@meyering.net http://github.com/schacon/git-source/commit/6281f394674bf2db861967da6c2215cfc3fc78af 6281f394674bf2db861967da6c2215cfc3fc78af 2007-12-08T14:24:13-08:00 2007-12-08T07:48:05-08:00 config.c:store_write_pair(): don't read the byte before a malloc'd buffer. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> fdfab53d81a1e017d1d12c45bb1e88eee3f606fe Junio C Hamano gitster@pobox.com f23272f3fd84fd37d97917f37233fbf01deb32b4 David Symonds dsymonds@gmail.com http://github.com/schacon/git-source/commit/8e7425da782cbdff4531d84e0ef4ec7bd3ae23d7 8e7425da782cbdff4531d84e0ef4ec7bd3ae23d7 2007-12-06T23:20:11-08:00 2007-12-06T15:36:45-08:00 Change from using email.com to example.com as example domain, as per RFC 2606. Signed-off-by: David Symonds <dsymonds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 33bfc06721ca1d75af163796365c5ff41be57101 Junio C Hamano gitster@pobox.com 6326cee51b21d67e1335ead285cb52b83234b2b4 Junio C Hamano gitster@pobox.com http://github.com/schacon/git-source/commit/f23272f3fd84fd37d97917f37233fbf01deb32b4 f23272f3fd84fd37d97917f37233fbf01deb32b4 2007-12-05T16:27:17-08:00 2007-12-04T23:01:30-08:00 git-am -i: report rewritten title Jeff Garzik noticed that "git am -i" reports the applied patch with the title before the user edited it. This was confusing. Signed-off-by: Junio C Hamano <gitster@pobox.com> 8d0982e61a984cb8789e729ac625c66f27c0474c Junio C Hamano gitster@pobox.com 9d25acc49a98ca82988ad871753a45e41f3c90f5 Junio C Hamano gitster@pobox.com http://github.com/schacon/git-source/commit/6326cee51b21d67e1335ead285cb52b83234b2b4 6326cee51b21d67e1335ead285cb52b83234b2b4 2007-12-05T16:16:40-08:00 2007-12-05T16:13:08-08:00 git grep shows the same hit repeatedly for unmerged paths When the index is unmerged, e.g. $ git ls-files -u 100644 faf413748eb6ccb15161a212156c5e348302b1b6 1 setup.c 100644 145eca50f41d811c4c8fcb21ed2604e6b2971aba 2 setup.c 100644 cb9558c49b6027bf225ba2a6154c4d2a52bcdbe2 3 setup.c running "git grep" for work tree files repeats hits for each unmerged stage. $ git grep -n -e setup_work_tree -- '*.[ch]' setup.c:209:void setup_work_tree(void) setup.c:209:void setup_work_tree(void) setup.c:209:void setup_work_tree(void) This should fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com> 430242cddae40db0ccf61506fcdce5cca3656d57 Junio C Hamano gitster@pobox.com 4e596e988abfd7ce0b4456cdbf27baa16fa7aab8 9459aa77a032621a29d53605542844641cca843a Junio C Hamano gitster@pobox.com http://github.com/schacon/git-source/commit/9d25acc49a98ca82988ad871753a45e41f3c90f5 9d25acc49a98ca82988ad871753a45e41f3c90f5 2007-12-05T15:07:23-08:00 2007-12-05T15:07:23-08:00 Merge branch 'nd/maint-work-tree-fix' into maint * nd/maint-work-tree-fix: Do check_repository_format() early (re-fix) Do check_repository_format() early Add missing inside_work_tree setting in setup_git_directory_gently 1ec1caad4bc04b7adf34336a2e6c4706a365a7a0 Junio C Hamano gitster@pobox.com 138dd1e990cef5ac0176426016ad5e1f8e5dff58 Nguyễn Thái Ngọc Duy pclouds@gmail.com http://github.com/schacon/git-source/commit/9459aa77a032621a29d53605542844641cca843a 9459aa77a032621a29d53605542844641cca843a 2007-12-05T15:06:37-08:00 2007-12-05T05:33:32-08:00 Do check_repository_format() early (re-fix) This pushes check_repository_format() (actually _gently() version) to setup_git_directory_gently() in order to prevent from using unsupported repositories. New setup_git_directory_gently()'s behaviour is stop searching for a valid gitdir and return as if there is no gitdir if a unsupported repository is found. Warning will be thrown in these cases. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01293ba54d1d3ed3a0d90c0f6f5a604c8dc479b6 Junio C Hamano gitster@pobox.com 1d557352f18a4b8f73be402674af6bd5bb152ab9 Jeff King peff@peff.net http://github.com/schacon/git-source/commit/4e596e988abfd7ce0b4456cdbf27baa16fa7aab8 4e596e988abfd7ce0b4456cdbf27baa16fa7aab8 2007-12-02T10:59:59-08:00 2007-12-02T09:22:19-08:00 t9600: test cvsimport from CVS working tree This test passes with v1.5.3.7, but not with v1.5.3.6. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 1f92e0b468ac14a3e225b53caa9f0cdd37e5b9e6 Junio C Hamano gitster@pobox.com 74e3f97be8934b5f37f3e5f44bdb5ce77f82541a Junio C Hamano gitster@pobox.com http://github.com/schacon/git-source/commit/1d557352f18a4b8f73be402674af6bd5bb152ab9 1d557352f18a4b8f73be402674af6bd5bb152ab9 2007-12-01T11:20:00-08:00 2007-12-01T11:20:00-08:00 GIT 1.5.3.7 Signed-off-by: Junio C Hamano <gitster@pobox.com> 8fd1f0c4e26c8fd37bc00909313432cd2dc4e9c5 Junio C Hamano gitster@pobox.com 10455d2a955a29db1809be139177e4e298771eb0 Junio C Hamano gitster@pobox.com http://github.com/schacon/git-source/commit/74e3f97be8934b5f37f3e5f44bdb5ce77f82541a 74e3f97be8934b5f37f3e5f44bdb5ce77f82541a 2007-12-01T11:06:41-08:00 2007-12-01T11:06:41-08:00 Fix typo in t4008 test title Signed-off-by: Junio C Hamano <gitster@pobox.com> 13780ef38b82ddc215b32edf9f7cc4b0fe50c7ee Junio C Hamano gitster@pobox.com 67d232426b8858b31e54a9b6a5a90916690d1153 Johannes Schindelin Johannes.Schindelin@gmx.de http://github.com/schacon/git-source/commit/10455d2a955a29db1809be139177e4e298771eb0 10455d2a955a29db1809be139177e4e298771eb0 2007-11-30T15:09:40-08:00 2007-11-30T03:35:23-08:00 Replace the word 'update-cache' by 'update-index' everywhere Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 87113e5f4cc8ee2fd679f27de3cc98ac39138046 Junio C Hamano gitster@pobox.com 1e8a1954519a070e92cb73f756b271664e1cc4d1 Nguyễn Thái Ngọc Duy pclouds@gmail.com http://github.com/schacon/git-source/commit/138dd1e990cef5ac0176426016ad5e1f8e5dff58 138dd1e990cef5ac0176426016ad5e1f8e5dff58 2007-11-30T15:05:48-08:00 2007-11-29T04:21:39-08:00 Do check_repository_format() early Repository version check is only performed when setup_git_directory() is called. This makes sure setup_git_directory_gently() does the check too. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 9dc15f7e289ebcf381f518718b8a2c6bd21cb0a1 Junio C Hamano gitster@pobox.com a6214fe06eefded4f71012043f35ad805e7dd19c Jeff King peff@peff.net http://github.com/schacon/git-source/commit/67d232426b8858b31e54a9b6a5a90916690d1153 67d232426b8858b31e54a9b6a5a90916690d1153 2007-11-30T15:00:31-08:00 2007-11-30T14:22:12-08:00 cvsimport: fix usage of cvsimport.module There were two problems: 1. We only look at the config variable if there is no module given on the command line. We checked this by comparing @ARGV == 0. However, at the time of the comparison, we have not yet parsed the dashed options, meaning that "git cvsimport" would read the variable but "git cvsimport -a" would not. This is fixed by simply moving the check after the call to getopt. 2. If the config variable did not exist, we were adding an empty string to @ARGV. The rest of the script, rather than barfing for insufficient input, would then try to import the module '', leading to rather confusing error messages. Based on patch from Emanuele Giaquinta. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> e22c9a837118f214ede706c44c6ef3ed766dc254 Junio C Hamano gitster@pobox.com fdd7d48d6a09c593a68c983c450443c1e55705e6 0750d751157addde94f28a7933ed4f914a526eb7 Junio C Hamano gitster@pobox.com http://github.com/schacon/git-source/commit/a6214fe06eefded4f71012043f35ad805e7dd19c a6214fe06eefded4f71012043f35ad805e7dd19c 2007-11-30T14:22:54-08:00 2007-11-30T14:22:54-08:00 Merge branch 'jk/maint-cvsimport-fix' into maint * jk/maint-cvsimport-fix: cvsimport: miscellaneous packed-ref fixes cvsimport: use rev-parse to support packed refs Add basic cvsimport tests 311df639cdab8a30abcab49ef540387c97bfe200 Junio C Hamano gitster@pobox.com 38762c47d6442dc0ce0f45533f9151877c485337 Johannes Sixt johannes.sixt@telecom.at http://github.com/schacon/git-source/commit/fdd7d48d6a09c593a68c983c450443c1e55705e6 fdd7d48d6a09c593a68c983c450443c1e55705e6 2007-11-30T14:16:52-08:00 2007-11-27T04:10:19-08:00 t7003-filter-branch: Fix test of a failing --msg-filter. The test passed for the wrong reason: If the script given to --msg-filter fails, it is expected that git-filter-branch aborts. But the test forgot to tell the branch name to rewrite, and so git-filter-branch failed due to incorrect usage. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> 1c7b5ad953c19ec50ad90c25f4ea10b9f5fd6cee Junio C Hamano gitster@pobox.com 1e72a40de99be24809eba5abdab4c0b00846b9b5 Junio C Hamano gitster@pobox.com http://github.com/schacon/git-source/commit/38762c47d6442dc0ce0f45533f9151877c485337 38762c47d6442dc0ce0f45533f9151877c485337 2007-11-28T16:41:18-08:00 2007-11-28T16:15:04-08:00 scripts: do not get confused with HEAD in work tree When you have a file called HEAD in your work tree, many commands that our scripts feed "HEAD" to would complain about the rev vs path ambiguity. A solution is to form command line more carefully by appending -- to them, which makes it clear that we mean HEAD rev not HEAD file. This patch would apply to maint. Signed-off-by: Junio C Hamano <gitster@pobox.com> 23b98d604a03c5715938cec97fe3fed1bde08bc9 Junio C Hamano gitster@pobox.com dc3e3ea3c838c1ddf7423401b4cf7a7dba528cff Jan Hudec bulb@ucw.cz http://github.com/schacon/git-source/commit/1e72a40de99be24809eba5abdab4c0b00846b9b5 1e72a40de99be24809eba5abdab4c0b00846b9b5 2007-11-28T15:50:59-08:00 2007-11-17T11:51:44-08:00 Improve description of git-branch -d and -D in man page. Some users expect that deleting a remote-tracking branch would prevent fetch from creating it again, so be explcit about that it's not the case. Also be a little more explicit about what fully merged means. Signed-off-by: Jan Hudec <bulb@ucw.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> d0ea3c7df119b431caf2569ffc8d6aa345adfcaf Junio C Hamano gitster@pobox.com 9da0dabcd9ff71083b6bbc9878c22b12002400dd Jeff King peff@peff.net http://github.com/schacon/git-source/commit/0750d751157addde94f28a7933ed4f914a526eb7 0750d751157addde94f28a7933ed4f914a526eb7 2007-11-28T14:38:35-08:00 2007-11-28T10:56:28-08:00 cvsimport: miscellaneous packed-ref fixes These were found with a grep for '$git_dir'; they all replace a direct access of "$git_dir/refs/..." with a call to git-rev-parse or git-update-ref. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 4f66ac21f80ac3d23234e2d77e5be7684fbdb0ac Junio C Hamano gitster@pobox.com 795c7c0b08fefc7d0f5d0903d8341491350996f0 Jeff King peff@peff.net http://github.com/schacon/git-source/commit/9da0dabcd9ff71083b6bbc9878c22b12002400dd 9da0dabcd9ff71083b6bbc9878c22b12002400dd 2007-11-28T14:38:06-08:00 2007-11-28T10:56:11-08:00 cvsimport: use rev-parse to support packed refs Previously, if refs were packed, git-cvsimport would assume that particular refs did not exist. This could lead to, for example, overwriting previous 'origin' commits that were packed. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 3026d6aabab042dad63ee87670e979fd249aec87 Junio C Hamano gitster@pobox.com dc3e3ea3c838c1ddf7423401b4cf7a7dba528cff Jeff King peff@peff.net http://github.com/schacon/git-source/commit/795c7c0b08fefc7d0f5d0903d8341491350996f0 795c7c0b08fefc7d0f5d0903d8341491350996f0 2007-11-28T14:14:21-08:00 2007-11-28T10:55:46-08:00 Add basic cvsimport tests We weren't even testing basic things before, so let's at least try importing and updating a trivial repository, which will catch total breakage. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 491ca69912fc01ae2090491891090473a77121b1 Junio C Hamano gitster@pobox.com f0c4881facabc0aa76f4b51871bd70c45effb508 1cdade2c4cb27f648a98d326ef3db523b6afafa7 Junio C Hamano gitster@pobox.com http://github.com/schacon/git-source/commit/dc3e3ea3c838c1ddf7423401b4cf7a7dba528cff dc3e3ea3c838c1ddf7423401b4cf7a7dba528cff 2007-11-25T19:04:27-08:00 2007-11-25T19:04:27-08:00 Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint * 'maint' of git://linux-nfs.org/~bfields/git: user-manual: recovering from corruption user-manual: clarify language about "modifying" old commits user-manual: failed push to public repository user-manual: define "branch" and "working tree" at start 5ab3f9de080e71b50234eae432caba430514f269 Junio C Hamano gitster@pobox.com 7cb192eab0251911e2ca77d4ecceb621dd2d34f5 J. Bruce Fields bfields@citi.umich.edu http://github.com/schacon/git-source/commit/1cdade2c4cb27f648a98d326ef3db523b6afafa7 1cdade2c4cb27f648a98d326ef3db523b6afafa7 2007-11-25T18:13:10-08:00 2007-03-03T19:53:37-08:00 user-manual: recovering from corruption Some instructions on dealing with corruption of the object database. Most of this text is from an example by Linus, identified by Nicolas Pitre <nico@cam.org> with a little further editing by me. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> 6b3ed8822d7b0e6b284d03f9b9e4919351ea88c8 J. Bruce Fields bfields@citi.umich.edu 81eb417ad423ef7e8d088d517f89d3bda92f9c06 J. Bruce Fields bfields@citi.umich.edu http://github.com/schacon/git-source/commit/7cb192eab0251911e2ca77d4ecceb621dd2d34f5 7cb192eab0251911e2ca77d4ecceb621dd2d34f5 2007-11-25T16:01:57-08:00 2007-11-25T16:01:57-08:00 user-manual: clarify language about "modifying" old commits It's important to remember that git doesn't really allowing "editing" or "modifying" commits, only replacing them by new commits. Redo some of the language to make this clearer. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> 364b199c92dba4e3f64920ffd364c13b211c73f2 J. Bruce Fields bfields@citi.umich.edu