d9cb6ccaa2f953bb2ba9e46155f30a81b1a33693 R. Tyler Ballance tyler@slide.com http://github.com/rtyler/slide-git/commit/6db72d2f0b153af351154d632d880a82bd8d84bd 6db72d2f0b153af351154d632d880a82bd8d84bd

2008-11-24T16:50:29-08:00

Update the Makefile to skip version generation 1e39250995d0b26fee185b358b14308400311fdc R. Tyler Ballance tyler@slide.com 3407da598edced2cf8454d8ee90bf3a6ef88bd61 R. Tyler Ballance tyler@slide.com http://github.com/rtyler/slide-git/commit/d9cb6ccaa2f953bb2ba9e46155f30a81b1a33693 d9cb6ccaa2f953bb2ba9e46155f30a81b1a33693

2008-11-24T15:36:03-08:00

Reduce window size on 64-bit machines from 1GB to a very conservative 128M to prevent Git from stomping on internal ulimit(3) restrictions 4316109dfe31c0d33fb410ba1fe2b2457f186d28 R. Tyler Ballance tyler@slide.com 7c181d627c136cbc67ef0f722e74e34017e662f0 R. Tyler Ballance tyler@ccnet.dev.slide.com http://github.com/rtyler/slide-git/commit/3407da598edced2cf8454d8ee90bf3a6ef88bd61 3407da598edced2cf8454d8ee90bf3a6ef88bd61

2008-11-24T15:33:40-08:00

Back-port of 59dd9ed183 from master to Slide build of v.1.6.0.4 Signed-off-by: R. Tyler Ballance <tyler@slide.com> > pack-objects: don't leak pack window reference when splitting packs > > Signed-off-by: Nicolas Pitre <nico@cam.org> > Signed-off-by: Junio C Hamano <gitster@pobox.com> a6c8aebfd92e15e6bca48cb387341bf3697b7654 R. Tyler Ballance tyler@ccnet.dev.slide.com ee5391c73efaf6dea06f769157fa1650d0bdce31 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/7c181d627c136cbc67ef0f722e74e34017e662f0 7c181d627c136cbc67ef0f722e74e34017e662f0

2008-11-08T21:29:22-08:00

2008-11-08T17:33:50-08:00

GIT 1.6.0.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> aaf333fdae6e80b7de306f9e5ade9f47d541f695 Junio C Hamano gitster@pobox.com 832e719d79296f1942a2aca5fb067bc610986fc4 Quy Tonthat qtonthat@gmail.com http://github.com/rtyler/slide-git/commit/ee5391c73efaf6dea06f769157fa1650d0bdce31 ee5391c73efaf6dea06f769157fa1650d0bdce31

2008-11-08T21:29:22-08:00

2008-09-12T09:22:44-07:00

Update RPM spec for the new location of git-cvsserver. git-cvsserver has been moved from libexecdir to bindir. Signed-off-by: Quy Tonthat <qtonthat@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 1aded21c56da2078ea3eddb747bc04229f0b81bc Junio C Hamano gitster@pobox.com 2819854ec5013fc0958ea477fa49d53fc0faee80 16ed2f48be228918af3d1a6c5a6a4fe9b832cb84 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/832e719d79296f1942a2aca5fb067bc610986fc4 832e719d79296f1942a2aca5fb067bc610986fc4

2008-11-08T17:32:49-08:00

Merge branch 'cb/maint-update-ref-fix' into maint * cb/maint-update-ref-fix: push: fix local refs update if already up-to-date do not force write of packed refs 8dfdf706b10fa4891ebaceb5ec7543078a73cc44 Junio C Hamano gitster@pobox.com 8b1981d32b41f1b4e26d8d96a3c6e63b9bc746b0 d8b24b930f5b7150e63d989de39eb71bd37e8e63 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/2819854ec5013fc0958ea477fa49d53fc0faee80 2819854ec5013fc0958ea477fa49d53fc0faee80

2008-11-08T16:50:25-08:00

Merge branch 'cj/maint-gitpm-fix-maybe-self' into maint * cj/maint-gitpm-fix-maybe-self: Git.pm: do not break inheritance 820f6da9fcd37798a7fc7de7179c21f8cc999eb1 Junio C Hamano gitster@pobox.com 3b8572a4297d8720b359c82e1dd9afeb45cda3cd a4f34cbb4cea1f0b0e625b528f269f4b517c64f8 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/8b1981d32b41f1b4e26d8d96a3c6e63b9bc746b0 8b1981d32b41f1b4e26d8d96a3c6e63b9bc746b0

2008-11-08T16:13:19-08:00

Merge branch 'ar/maint-mksnpath' into maint * ar/maint-mksnpath: Use git_pathdup instead of xstrdup(git_path(...)) git_pathdup: returns xstrdup-ed copy of the formatted path Fix potentially dangerous use of git_path in ref.c Add git_snpath: a .git path formatting routine with output buffer Fix potentially dangerous uses of mkpath and git_path Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.c Add mksnpath which allows you to specify the output buffer Conflicts: builtin-revert.c rerere.c 13daae95357e1877e57e742dd9ea77ca5d3e3b16 Junio C Hamano gitster@pobox.com 16088d8870b7da6d4dd280be2d1728dd3be346b5 045a476f91a9a308c823a2709977163238baa3fd Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/3b8572a4297d8720b359c82e1dd9afeb45cda3cd 3b8572a4297d8720b359c82e1dd9afeb45cda3cd

2008-11-08T16:07:37-08:00

Merge branch 'mv/maint-branch-m-symref' into maint * mv/maint-branch-m-symref: update-ref --no-deref -d: handle the case when the pointed ref is packed git branch -m: forbid renaming of a symref Fix git update-ref --no-deref -d. rename_ref(): handle the case when the reflog of a ref does not exist Fix git branch -m for symrefs. 88163ad281fc3b0e69246ccb026cddd4bae0b367 Junio C Hamano gitster@pobox.com 5bdd8d4a3062ac8f29ec511fecb85049f6ff3ecc Clemens Buchacher drizzd@aon.at http://github.com/rtyler/slide-git/commit/16ed2f48be228918af3d1a6c5a6a4fe9b832cb84 16ed2f48be228918af3d1a6c5a6a4fe9b832cb84

2008-11-05T14:22:10-08:00

2008-11-05T12:55:54-08:00

push: fix local refs update if already up-to-date git push normally updates local refs only after a successful push. If the remote already has the updates -- pushed indirectly through another repository, for example -- we forget to update local tracking refs. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27ac815ad2611de47e90d2d7f14cdff54f6f0c43 Junio C Hamano gitster@pobox.com 16088d8870b7da6d4dd280be2d1728dd3be346b5 Clemens Buchacher drizzd@aon.at http://github.com/rtyler/slide-git/commit/5bdd8d4a3062ac8f29ec511fecb85049f6ff3ecc 5bdd8d4a3062ac8f29ec511fecb85049f6ff3ecc

2008-11-05T14:09:43-08:00

2008-11-05T12:55:53-08:00

do not force write of packed refs We force writing a ref if it does not exist. Originally, we only had to look for the ref file to check if it existed. Now we have to look for a packed ref as well. Luckily, resolve_ref already does all the work for us. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> d3b9070702938cd3f0455cca7894896ed5b1113c Junio C Hamano gitster@pobox.com a5a323f33cd25829e0dde3939b196cf743d7d9d8 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/16088d8870b7da6d4dd280be2d1728dd3be346b5 16088d8870b7da6d4dd280be2d1728dd3be346b5

2008-11-02T20:45:55-08:00

format-patch documentation: mention the special case of showing a single commit Even long timers seem to have missed that "format-patch -1 $commit" is a much simpler and more obvious way to say "format-patch $commit^..$commit" from the current documentation (and an example "format-patch -3 $commit" to get three patches). Add an explicit instruction in a much earlier part of the documentation to make it easier to find. Signed-off-by: Junio C Hamano <gitster@pobox.com> 8d74f2788dd2d6bc98d806024ed5e756ca1b953b Junio C Hamano gitster@pobox.com 7756ba74c04caf03d47718d581439a48bae7ed73 Yann Dirson ydirson@altern.org http://github.com/rtyler/slide-git/commit/a5a323f33cd25829e0dde3939b196cf743d7d9d8 a5a323f33cd25829e0dde3939b196cf743d7d9d8

2008-11-02T15:57:10-08:00

2008-11-02T05:37:28-08:00

Add reference for status letters in documentation. Also fix error in diff_filepair::status documentation, and point to the in-code reference as well as the doc. Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> fcab3161b7077c7897f35fb7d0c512fd6c8694c9 Junio C Hamano gitster@pobox.com 02893a8503158823e42ca1d4d59faae691684b54 Mikael Magnusson mikachu@gmail.com http://github.com/rtyler/slide-git/commit/7756ba74c04caf03d47718d581439a48bae7ed73 7756ba74c04caf03d47718d581439a48bae7ed73

2008-11-02T15:51:37-08:00

2008-11-02T10:32:46-08:00

Document that git-log takes --all-match. Signed-off-by: Mikael Magnusson <mikachu@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 406c234e57e72f82081a81f03452c0c6370b49e1 Junio C Hamano gitster@pobox.com f6276b788f26c3c148c2d5465a6b03fc09bb785c Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/02893a8503158823e42ca1d4d59faae691684b54 02893a8503158823e42ca1d4d59faae691684b54

2008-11-02T14:35:41-08:00

Update draft 1.6.0.4 release notes Signed-off-by: Junio C Hamano <gitster@pobox.com> f98fa17eadfe0d673fb6a3bfa07c520560855a24 Junio C Hamano gitster@pobox.com 86e67a088c581da4da36acf0edd8c27b1033e51e b0ad11ea165e07308fc02a5091efbe2e2d22237c Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/f6276b788f26c3c148c2d5465a6b03fc09bb785c f6276b788f26c3c148c2d5465a6b03fc09bb785c

2008-11-02T13:37:16-08:00

Merge branch 'js/maint-fetch-update-head' into maint * js/maint-fetch-update-head: pull: allow "git pull origin $something:$current_branch" into an unborn branch Fix fetch/pull when run without --update-head-ok 51087b88150e40113d3c90f3822f0e0c9e5a4caa Junio C Hamano gitster@pobox.com d11ddaff021be8006e71b43a5205c48f2dac7f18 98fa473887d0bebd38d568bb07232a336a642dcf Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/86e67a088c581da4da36acf0edd8c27b1033e51e 86e67a088c581da4da36acf0edd8c27b1033e51e

2008-11-02T13:37:13-08:00

Merge branch 'jk/maint-ls-files-other' into maint * jk/maint-ls-files-other: refactor handling of "other" files in ls-files and status ff6c53429e67c4f44f7c7b07cfa8bcb980c7570a Junio C Hamano gitster@pobox.com 581000a4196d196d221bb6164a49a8a52ce30730 d1a43f2aa4bfb5aef29e9e1fe1fb9bb18c0e8b65 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/d11ddaff021be8006e71b43a5205c48f2dac7f18 d11ddaff021be8006e71b43a5205c48f2dac7f18

2008-11-02T13:36:20-08:00

Merge branch 'jc/maint-reset-remove-unmerged-new' into maint * jc/maint-reset-remove-unmerged-new: reset --hard/read-tree --reset -u: remove unmerged new paths 65f7e74345440c22103ec9ee1fddbb4a834fc34e Junio C Hamano gitster@pobox.com 1a9016aae5aa8c468bb2d8d5dd16303d5c005869 acd3b9eca82e38950f94e4708b528b7dae09a7c8 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/581000a4196d196d221bb6164a49a8a52ce30730 581000a4196d196d221bb6164a49a8a52ce30730

2008-11-02T13:36:14-08:00

Merge branch 'jc/maint-co-track' into maint * jc/maint-co-track: Enhance hold_lock_file_for_{update,append}() API demonstrate breakage of detached checkout with symbolic link HEAD Fix "checkout --track -b newbranch" on detached HEAD d177274e6739292d466213fc02abf5811bf86ce6 Junio C Hamano gitster@pobox.com c2163c6aa2343b21ebc73f7e62cbdecc8dba3a42 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/1a9016aae5aa8c468bb2d8d5dd16303d5c005869 1a9016aae5aa8c468bb2d8d5dd16303d5c005869

2008-11-02T00:14:04-07:00

Start 1.6.0.4 cycle Signed-off-by: Junio C Hamano <gitster@pobox.com> 891988f4fe4694a6a312c00efc1ff088f5380e73 Junio C Hamano gitster@pobox.com 4f73e240f98c38e608afe68887639c6e63b1d18f Tom Preston-Werner tom@github.com http://github.com/rtyler/slide-git/commit/c2163c6aa2343b21ebc73f7e62cbdecc8dba3a42 c2163c6aa2343b21ebc73f7e62cbdecc8dba3a42

2008-11-01T23:48:52-07:00

2008-11-01T08:28:18-07:00

add instructions on how to send patches to the mailing list with Gmail Gmail is one of the most popular email providers in the world. Now that Gmail supports IMAP, sending properly formatted patches via `git imap-send` is trivial. This section in SubmittingPatches explains how to do so. Signed-off-by: Tom Preston-Werner <tom@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 5ea09e1406b6098f6af428edc13825686d3712f2 Junio C Hamano gitster@pobox.com 8c178687959732edab8bf91da9ed9f4fbcf7c14e Jakub Narebski jnareb@gmail.com http://github.com/rtyler/slide-git/commit/4f73e240f98c38e608afe68887639c6e63b1d18f 4f73e240f98c38e608afe68887639c6e63b1d18f

2008-11-01T23:48:48-07:00

2008-10-31T23:24:55-07:00

Documentation/gitattributes: Add subsection header for each attribute This makes attributes easier to find; before this patch some attributes had individual subsections, and some didn't. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> a90c15a63375d6ad15e6728408f99b67246ad903 Junio C Hamano gitster@pobox.com 30affa1e9a15e848f77c9c14544dd6dd593559d5 Pierre Habouzit madcoder@debian.org http://github.com/rtyler/slide-git/commit/8c178687959732edab8bf91da9ed9f4fbcf7c14e 8c178687959732edab8bf91da9ed9f4fbcf7c14e

2008-11-01T23:48:45-07:00

2008-10-31T11:57:10-07:00

git send-email: avoid leaking directory file descriptors. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 99b152ee9a9ebd19a47b0304c9fd5f6d22388e6f Junio C Hamano gitster@pobox.com 1442171bc913a9cddae5c6ad0d0a4be3a1ca86e8 Jeff King peff@peff.net http://github.com/rtyler/slide-git/commit/30affa1e9a15e848f77c9c14544dd6dd593559d5 30affa1e9a15e848f77c9c14544dd6dd593559d5

2008-11-01T23:48:39-07:00

2008-10-28T22:17:55-07:00

send-pack: do not send out single-level refs such as refs/stash Since no version of receive-pack accepts these "funny refs", we should mirror the check when considering the list of refs to send. IOW, don't even make them eligible for matching or mirroring. Signed-off-by: Junio C Hamano <gitster@pobox.com> 88582765056b932f4ea9bb9cd93464cb7cf29830 Junio C Hamano gitster@pobox.com 421b488a58fea89ceb55d5b358738e9251d44f5e Jeff King peff@peff.net http://github.com/rtyler/slide-git/commit/1442171bc913a9cddae5c6ad0d0a4be3a1ca86e8 1442171bc913a9cddae5c6ad0d0a4be3a1ca86e8

2008-11-01T23:46:53-07:00

2008-10-22T21:32:23-07:00

fix overlapping memcpy in normalize_absolute_path The comments for normalize_absolute_path explicitly claim that the source and destination buffers may be the same (though they may not otherwise overlap). Thus the call to memcpy may involve copying overlapping data, and memmove should be used instead. This fixes a valgrind error in t1504. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> c81f4f11de2093f448d196ed53ae246de87bbe23 Junio C Hamano gitster@pobox.com 13494ed14c3539b3e36ff47d1d8b65f5a9a3043b Jeff King peff@peff.net http://github.com/rtyler/slide-git/commit/421b488a58fea89ceb55d5b358738e9251d44f5e 421b488a58fea89ceb55d5b358738e9251d44f5e

2008-11-01T23:46:40-07:00

2008-10-22T21:31:03-07:00

pack-objects: avoid reading uninitalized data In the main loop of find_deltas, we do: struct object_entry *entry = *list++; ... if (!*list_size) ... break Because we look at and increment *list _before_ the check of list_size, in the very last iteration of the loop we will look at uninitialized data, and increment the pointer beyond one past the end of the allocated space. Since we don't actually do anything with the data until after the check, this is not a problem in practice. But since it technically violates the C standard, and because it provokes a spurious valgrind warning, let's just move the initialization of entry to a safe place. This fixes valgrind errors in t5300, t5301, t5302, t303, and t9400. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 8fe7667f7e5adef5e98d5da98dbeb1eff2404723 Junio C Hamano gitster@pobox.com faf1dc7223be9ffddf775916913bb8e22762cdfb Jeff King peff@peff.net http://github.com/rtyler/slide-git/commit/13494ed14c3539b3e36ff47d1d8b65f5a9a3043b 13494ed14c3539b3e36ff47d1d8b65f5a9a3043b

2008-11-01T23:46:34-07:00

2008-10-22T21:30:58-07:00

correct cache_entry allocation Most cache_entry structs are allocated by using the cache_entry_size macro, which rounds the size of the struct up to the nearest multiple of 8 bytes (presumably to avoid memory fragmentation). There is one exception: the special "conflict entry" is allocated with an empty name, and so is explicitly given just one extra byte to hold the NUL. However, later code doesn't realize that this particular struct has been allocated differently, and happily tries reading and copying it based on the ce_size macro, which assumes the 8-byte alignment. This can lead to reading uninitalized data, though since that data is simply padding, there shouldn't be any problem as a result. Still, it makes sense to hold the padding assumption so as not to surprise later maintainers. This fixes valgrind errors in t1005, t3030, t4002, and t4114. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> c02062778a40cb0cb3c63d5675e8e94dcc643231 Junio C Hamano gitster@pobox.com e855bfc0404d3344787541c1bdaa1e8d44398eb3 dd87558f58d989e47de09eafefa8d2f2ea4de27d Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/faf1dc7223be9ffddf775916913bb8e22762cdfb faf1dc7223be9ffddf775916913bb8e22762cdfb

2008-11-01T22:31:14-07:00

Merge branch 'maint' of git://repo.or.cz/git-gui into maint * 'maint' of git://repo.or.cz/git-gui: git-gui: Help identify aspell version on Windows too 0bf53d2def96c5a26e2e80c0e7802a17701f9fb1 Junio C Hamano gitster@pobox.com fa58186c9ba50514b36ac5ef192cd7e0bc4d7780 Miklos Vajna vmiklos@frugalware.org http://github.com/rtyler/slide-git/commit/045a476f91a9a308c823a2709977163238baa3fd 045a476f91a9a308c823a2709977163238baa3fd

2008-10-31T22:41:55-07:00

2008-10-31T16:25:44-07:00

update-ref --no-deref -d: handle the case when the pointed ref is packed In this case we did nothing in the past, but we should delete the reference in fact. The problem was that when the symref is not packed but the referenced ref is packed, then we assumed that the symref is packed as well, but symrefs are never packed. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 3743a1b43643d369f1c5a6598e58a61ac44b14b4 Junio C Hamano gitster@pobox.com 2c850f1221efd2441c3794e163ea3918ce31c15b Deskin Miller deskinm@umich.edu http://github.com/rtyler/slide-git/commit/e855bfc0404d3344787541c1bdaa1e8d44398eb3 e855bfc0404d3344787541c1bdaa1e8d44398eb3

2008-10-31T01:22:48-07:00

2008-10-30T21:10:25-07:00

git-svn: change dashed git-commit-tree to git commit-tree Signed-off-by: Deskin Miller <deskinm@umich.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> a20c7e738d1d6d33a0dc50e67fa3bfe89edbe23f Junio C Hamano gitster@pobox.com