1fc2cbc1d8614c469d28a5a8f11a904f294245af Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/1fdf6ee6f81b31b299a8039832f45290faa4583a 1fdf6ee6f81b31b299a8039832f45290faa4583a 2008-08-06T14:00:36-07:00 2008-08-06T12:44:55-07:00 GIT 1.6.0-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 8c4234b7769d47f5360d83895b1af3db53fe4454 Junio C Hamano gitster@pobox.com f44bc33c7283c19a86797ffdaafd22a19bbdfbd6 Brandon Casey casey@nrlssc.navy.mil http://github.com/git/git/commit/1fc2cbc1d8614c469d28a5a8f11a904f294245af 1fc2cbc1d8614c469d28a5a8f11a904f294245af 2008-08-06T14:00:36-07:00 2008-08-05T16:23:08-07:00 perl/Makefile: handle paths with spaces in the NO_PERL_MAKEMAKER section Use double quotes to protect against paths which may contain spaces. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> 679bd7c2b4f1148f0434d3d3abc4fe30759eeba2 Junio C Hamano gitster@pobox.com d96ca27e1089a190139591ac365873f26bffcf5c 781c1834f5419bdf81bb7f3750170ccd6b809174 Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/f44bc33c7283c19a86797ffdaafd22a19bbdfbd6 f44bc33c7283c19a86797ffdaafd22a19bbdfbd6 2008-08-06T13:50:48-07:00 2008-08-06T13:50:42-07:00 Sync with 1.5.6.5 9e33941160873fda6e65de8c94fa3a4178631c0f Junio C Hamano gitster@pobox.com dbd0f5c7692cce0c5fea535a06622b3a93df9598 Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/781c1834f5419bdf81bb7f3750170ccd6b809174 781c1834f5419bdf81bb7f3750170ccd6b809174 2008-08-06T13:40:53-07:00 2008-08-06T12:04:06-07:00 GIT 1.5.6.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> 59a1f73850961ceb9b0853466f9f7ee510bb3a01 Junio C Hamano gitster@pobox.com eabbc99a2198d1cae62ce951457e7edc23b5f1a9 Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/dbd0f5c7692cce0c5fea535a06622b3a93df9598 dbd0f5c7692cce0c5fea535a06622b3a93df9598 2008-08-06T13:38:18-07:00 2008-08-06T11:43:47-07:00 Files given on the command line are relative to $cwd When running "git commit -F file" and "git tag -F file" from a subdirectory, we should take it as relative to the directory we started from, not relative to the top-level directory. This adds a helper function "parse_options_fix_filename()" to make it more convenient to fix this class of issues. Ideally, parse_options() should support a new type of option, "OPT_FILENAME", to do this uniformly, but this patch is meant to go to 'maint' to fix it minimally. One thing to note is that value for "commit template file" that comes from the command line is taken as relative to $cwd just like other parameters, but when it comes from the configuration varilable 'commit.template', it is taken as relative to the working tree root as before. I think this difference actually is sensible (not that I particularly think commit.template itself is sensible). Signed-off-by: Junio C Hamano <gitster@pobox.com> 92606e8799f9f518296ef4e9124cf782d7e234f2 Junio C Hamano gitster@pobox.com 847d10f56d7853cd0e139a7c2e6ad0ad2de5c464 9534c9fb31dfe4c5c367042c97a160c42b1eefdf Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/d96ca27e1089a190139591ac365873f26bffcf5c d96ca27e1089a190139591ac365873f26bffcf5c 2008-08-06T13:32:18-07:00 2008-08-06T13:32:18-07:00 Merge git://repo.or.cz/git-gui * git://repo.or.cz/git-gui: git-gui: Adapt discovery of oguilib to execdir 'libexec/git-core' git-gui: add a part about format strings in po/README git-gui: update po/it.po git-gui: update Japanese translation git-gui: Update swedish translation. git-gui: Update git-gui.pot for 0.11 nearing release git-gui: Update German translation 93782a459cfd8029268e5f09747b504915ac275c Junio C Hamano gitster@pobox.com 65ac5530abcc3699ebc27126d8389f35baa8cafe 8eacbc1b03da401fbeaf67c4e2db8392692af88d Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/847d10f56d7853cd0e139a7c2e6ad0ad2de5c464 847d10f56d7853cd0e139a7c2e6ad0ad2de5c464 2008-08-06T13:32:12-07:00 2008-08-06T13:32:12-07:00 Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Update swedish translation. gitk: Updated German translation gitk: Fallback to selecting the head commit upon load gitk: Fixed automatic row selection during load gitk: Fixed broken exception handling in diff gitk: On Windows, use a Cygwin-specific flag for kill gitk: Arrange to kill diff-files & diff-index on quit gitk: Kill back-end processes on window close 0bdc0287ceb6faf0695995b0a7a13a4f76c1c599 Junio C Hamano gitster@pobox.com ddd63e64e4ac7e455dff3e807bf6a6977bb61456 4fac1d3a98bb86d855b706d7ce6a5069b9f687e8 Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/65ac5530abcc3699ebc27126d8389f35baa8cafe 65ac5530abcc3699ebc27126d8389f35baa8cafe 2008-08-06T13:31:38-07:00 2008-08-06T13:31:38-07:00 Merge branch 'rs/archive-parse-options' * rs/archive-parse-options: archive: allow --exec and --remote without equal sign 0d720a30873bd3bd88866647c80ffe8a237d488e Junio C Hamano gitster@pobox.com 2d0f5f3459278475602394a7165bf8919412f4e4 Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/eabbc99a2198d1cae62ce951457e7edc23b5f1a9 eabbc99a2198d1cae62ce951457e7edc23b5f1a9 2008-08-05T23:30:11-07:00 2008-08-05T22:32:28-07:00 fix diff-tree --stdin documentation Long time ago, the feature of "diff-tree --stdin" to take a commit and its parents on one line was broken, and did not support the common: git rev-list --parents $commits... -- $paths... | git diff-tree --stdin -v -p usage pattern by Porcelains properly. For diff-tree to talk sensibly about commits, it needs to see commits, not just trees; the code was fixed to take list of commits on the standard input in 1.2.0. However we left the documentation stale for a long time, until Karl Hasselström finally noticed it very recently. Signed-off-by: Junio C Hamano <gitster@pobox.com> 89bc12f3633cce79eef6177fa5e027153a5ca908 Junio C Hamano gitster@pobox.com 3d32a46b247222a97007419fa865efce959b002d Steven Grimm koreth@midwinter.com http://github.com/git/git/commit/ddd63e64e4ac7e455dff3e807bf6a6977bb61456 ddd63e64e4ac7e455dff3e807bf6a6977bb61456 2008-08-05T21:21:20-07:00 2008-08-05T13:08:41-07:00 Optimize sha1_object_info for loose objects, not concurrent repacks When dealing with a repository with lots of loose objects, sha1_object_info would rescan the packs directory every time an unpacked object was referenced before finally giving up and looking for the loose object. This caused a lot of extra unnecessary system calls during git pack-objects; the code was rereading the entire pack directory once for each loose object file. This patch looks for a loose object before falling back to rescanning the pack directory, rather than the other way around. Signed-off-by: Steven Grimm <koreth@midwinter.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 7aa1f68152ab489b540f9d4c742303c387c05e38 Junio C Hamano gitster@pobox.com 1127c51cfe09f0d7d26869e7a895190214ce049a Brandon Casey casey@nrlssc.navy.mil http://github.com/git/git/commit/3d32a46b247222a97007419fa865efce959b002d 3d32a46b247222a97007419fa865efce959b002d 2008-08-05T21:21:20-07:00 2008-08-05T11:01:50-07:00 Teach fsck and prune that tmp_obj_ file names may not be 14 bytes long As Shawn pointed out, not all temporary file creation routines can ensure that the generated temporary file is of a certain length. e.g. Java's createTempFile(prefix, suffix). So just depend on the prefix 'tmp_obj_' for detection. Update prune, and fix the "fix" introduced by a08c53a1 :) Signed-off-by: Brandon "appendixless" Casey <casey@nrlssc.navy.mil> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> e4f7d85bf8a4acc5f1726f2881c2b848bb5d0320 Junio C Hamano gitster@pobox.com b1bc1494edb1775e94a159dea67908b27c29017f Lee Marlow lee.marlow@gmail.com http://github.com/git/git/commit/1127c51cfe09f0d7d26869e7a895190214ce049a 1127c51cfe09f0d7d26869e7a895190214ce049a 2008-08-05T21:21:20-07:00 2008-08-04T22:50:38-07:00 bash completion: Add completion for 'git mv' Add completions for all long options specified in the docs --dry-run Signed-off-by: Lee Marlow <lee.marlow@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 5b05a55c2998180cc9859503a2c00282b4a91479 Junio C Hamano gitster@pobox.com b3191ce2d5a77c17e5a236823f2dc7393e440171 Lee Marlow lee.marlow@gmail.com http://github.com/git/git/commit/b1bc1494edb1775e94a159dea67908b27c29017f b1bc1494edb1775e94a159dea67908b27c29017f 2008-08-05T21:21:19-07:00 2008-08-04T22:50:37-07:00 bash completion: Add completion for 'git ls-files' Add completions for all long options specified in the docs --cached --deleted --modified --others --ignored --stage --directory --no-empty-directory --unmerged --killed --exclude= --exclude-from= --exclude-per-directory= --exclude-standard --error-unmatch --with-tree= --full-name --abbrev --ignored --exclude-per-directory Signed-off-by: Lee Marlow <lee.marlow@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 144de061f1335c0f06f49dc5b252b7d77a7d1c9d Junio C Hamano gitster@pobox.com 95d43780cff575cfffeea881464c77f84f8d7244 Lee Marlow lee.marlow@gmail.com http://github.com/git/git/commit/b3191ce2d5a77c17e5a236823f2dc7393e440171 b3191ce2d5a77c17e5a236823f2dc7393e440171 2008-08-05T21:21:19-07:00 2008-08-04T22:50:36-07:00 bash completion: Add completion for 'git archive' Add completions for all long options specified in the docs --format= --list --verbose --prefix= --remote= --exec= The --format= long option can be completed with available formats and the --remote= can be completed with defined remote repositories. Signed-off-by: Lee Marlow <lee.marlow@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> d290e90c8c7a3cc99bd72654f817a8ba9fe3e660 Junio C Hamano gitster@pobox.com a6c2be244f45432617944e684156556482fb11b6 Lee Marlow lee.marlow@gmail.com http://github.com/git/git/commit/95d43780cff575cfffeea881464c77f84f8d7244 95d43780cff575cfffeea881464c77f84f8d7244 2008-08-05T21:21:19-07:00 2008-08-04T22:50:35-07:00 bash completion: More completions for 'git stash' Add branch subcommand to completions and USAGE for git-stash.sh. Complete stash names for show, apply, drop, pop, and branch. Add "--index" long option for apply. Signed-off-by: Lee Marlow <lee.marlow@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 555b0868051fee70f252193606e8638eeb701851 Junio C Hamano gitster@pobox.com 5dad868b26919b03dd78fba182a152224a904d3a Lee Marlow lee.marlow@gmail.com http://github.com/git/git/commit/a6c2be244f45432617944e684156556482fb11b6 a6c2be244f45432617944e684156556482fb11b6 2008-08-05T21:21:19-07:00 2008-08-04T22:50:34-07:00 bash completion: Add completion for 'git revert' Add completions for all long options specified in the docs --edit --mainline --no-edit --no-commit --signoff Signed-off-by: Lee Marlow <lee.marlow@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> c77115691ec77b5ea678e1277342fa6313a006d8 Junio C Hamano gitster@pobox.com 4181c7e8a7ece0cf117e7ec6bb8bca989e116f7e Lee Marlow lee.marlow@gmail.com http://github.com/git/git/commit/5dad868b26919b03dd78fba182a152224a904d3a 5dad868b26919b03dd78fba182a152224a904d3a 2008-08-05T21:21:19-07:00 2008-08-04T22:50:33-07:00 bash completion: Add completion for 'git init' Add completions for all long options specified in the docs --quiet --bare --template= --shared --shared={false|true|umask|group|all|world|everybody} Signed-off-by: Lee Marlow <lee.marlow@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> b32417f6b8613a2abb2380824c02152ff6fa177c Junio C Hamano gitster@pobox.com 3eb11012078e9a2b9f444dbf1aae1f1cdd33fef1 Lee Marlow lee.marlow@gmail.com http://github.com/git/git/commit/4181c7e8a7ece0cf117e7ec6bb8bca989e116f7e 4181c7e8a7ece0cf117e7ec6bb8bca989e116f7e 2008-08-05T21:21:19-07:00 2008-08-04T22:50:32-07:00 bash completion: Add completion for 'git clean' Add completions for all long options specified in the docs --dry-run --quiet Signed-off-by: Lee Marlow <lee.marlow@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 1e322a281e6f6fcec17cacc5419195a39caaa6db Junio C Hamano gitster@pobox.com 80828488cc5b1fd8395a27e272fa5f855c1ae472 Lee Marlow lee.marlow@gmail.com http://github.com/git/git/commit/3eb11012078e9a2b9f444dbf1aae1f1cdd33fef1 3eb11012078e9a2b9f444dbf1aae1f1cdd33fef1 2008-08-05T21:21:19-07:00 2008-08-04T22:50:31-07:00 bash completion: Add completion for 'git clone' Add completions for all long options specified in the docs --local --no-hardlinks --shared --reference --quiet --no-checkout --bare --mirror --origin --upload-pack --template= --depth Signed-off-by: Lee Marlow <lee.marlow@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2d60251525e2ed6704cf01236eb478f59262f931 Junio C Hamano gitster@pobox.com d9042a0ac41ebd23e4dac00371a682d964eafee7 Eric Wong normalperson@yhbt.net http://github.com/git/git/commit/80828488cc5b1fd8395a27e272fa5f855c1ae472 80828488cc5b1fd8395a27e272fa5f855c1ae472 2008-08-05T21:21:19-07:00 2008-08-05T00:35:18-07:00 t9119: conditionally re-enable test depending on svn(1) version I've tested this with svn 1.4.4 This also adds quoting to make it work odd characters in the trash path. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> e8fb7efcff6dd1e5a457e88d938c581f74eaf9fb Junio C Hamano gitster@pobox.com bd2d4f96b34ae295413f35eab687d7eff26564ee David D. Kilzer ddkilzer@kilzer.net http://github.com/git/git/commit/d9042a0ac41ebd23e4dac00371a682d964eafee7 d9042a0ac41ebd23e4dac00371a682d964eafee7 2008-08-05T21:21:19-07:00 2008-08-05T00:35:17-07:00 Fix race condition in t9119-git-svn-info.sh Changed the ptouch bash function to use the "Text Last Updated" date reported by 'svn info' when changing the modified time (mtime) of the file/symlink/directory in the git working directory. Previously it used the mtime of the item in the svn working directory, which caused the race condition. [ew: swapped argument order of ptouch() to minimize diff] From: David D. Kilzer <ddkilzer@kilzer.net> Signed-off-by: David D. Kilzer <ddkilzer@kilzer.net> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> dd0b29a0a78c8a886b96c428a55dd8caf59629e2 Junio C Hamano gitster@pobox.com 1168d402d2962f56cbc921bbc954d8f2179c8ba7 Eric Wong normalperson@yhbt.net http://github.com/git/git/commit/bd2d4f96b34ae295413f35eab687d7eff26564ee bd2d4f96b34ae295413f35eab687d7eff26564ee 2008-08-05T21:21:19-07:00 2008-08-05T00:35:16-07:00 git-svn: properly set path for "info" command canonicalize_path() was previously changed to better fit SVN 1.5, but it makes the "info" command not match svn(1) in two places: 1) URL ended up with a trailing slash when run without an argument. 2) "Path: " was displayed instead of "Path: ." when run without an argument. We will also handle odd cases where a user wants to get information on a file or directory named "0", too. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> cb0517905c2e4cc4c1627a971c5a0bb1b1a26fb3 Junio C Hamano gitster@pobox.com 04bb50f45dda9aeb755e943cbc9df264cfc8cbc5 Mike Ralphson mike@abacus.co.uk http://github.com/git/git/commit/1168d402d2962f56cbc921bbc954d8f2179c8ba7 1168d402d2962f56cbc921bbc954d8f2179c8ba7 2008-08-05T21:21:18-07:00 2008-08-05T09:12:05-07:00 Documentation: typos / spelling fixes Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 74f6851b69153316af6706004e11c0a1a14ee757 Junio C Hamano gitster@pobox.com fba5279db904aa49bb75bb31614571b9b6d75b33 2d0f5f3459278475602394a7165bf8919412f4e4 Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/04bb50f45dda9aeb755e943cbc9df264cfc8cbc5 04bb50f45dda9aeb755e943cbc9df264cfc8cbc5 2008-08-05T21:21:08-07:00 2008-08-05T21:21:08-07:00 Merge branch 'maint' * maint: RelNotes 1.5.6.5 updates diff.renamelimit is a basic diff configuration git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout. Documentation: typos / spelling fixes in older RelNotes a863b7f6bcfee344db722621d08bdc1ddbbacc6f Junio C Hamano gitster@pobox.com 2b6ca6df2dbe9c23d0adfc1f59678a2d85c560b2 Junio C Hamano gitster@pobox.com http://github.com/git/git/commit/2d0f5f3459278475602394a7165bf8919412f4e4 2d0f5f3459278475602394a7165bf8919412f4e4 2008-08-05T21:20:59-07:00 2008-08-05T21:20:59-07:00 RelNotes 1.5.6.5 updates Signed-off-by: Junio C Hamano <gitster@pobox.com> f14a51ff1124686f269ffa9065ba2e070298f5ce Junio C Hamano gitster@pobox.com 3be3999849bf993162fc957f47fc99325c324e9c Linus Torvalds torvalds@linux-foundation.org http://github.com/git/git/commit/2b6ca6df2dbe9c23d0adfc1f59678a2d85c560b2 2b6ca6df2dbe9c23d0adfc1f59678a2d85c560b2 2008-08-05T18:27:31-07:00 2008-08-05T11:27:30-07:00 diff.renamelimit is a basic diff configuration The configuration was added as a core option in 3299c6f (diff: make default rename detection limit configurable., 2005-11-15), but 9ce392f (Move diff.renamelimit out of default configuration., 2005-11-21) separated diff-related stuff out of the core. Up to that point it was Ok. When we separated the Porcelain options out of the git_diff_config in 83ad63c (diff: do not use configuration magic at the core-level, 2006-07-08), we should have been more careful. This mistake made diff-tree plumbing and git-show Porcelain to notice different set of renames when the user explicitly asked for rename detection. Signed-off-by: Junio C Hamano <gitster@pobox.com> 5306944a6cca0d4f3d675c90a2e42af29cd3c432 Junio C Hamano gitster@pobox.com f70f988b11f3ec24df023b105967978410828ea1 Jim Meyering jim@meyering.net http://github.com/git/git/commit/3be3999849bf993162fc957f47fc99325c324e9c 3be3999849bf993162fc957f47fc99325c324e9c 2008-08-05T11:40:28-07:00 2008-08-05T07:54:42-07:00 git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 52710e10d91dc0e09dd0a2194d902ae36a4ceed4 Junio C Hamano gitster@pobox.com 7c5b1675a88a52be1822129e4aa915c5531f6700 Mike Ralphson mike@abacus.co.uk http://github.com/git/git/commit/f70f988b11f3ec24df023b105967978410828ea1 f70f988b11f3ec24df023b105967978410828ea1 2008-08-05T11:38:11-07:00 2008-08-05T09:12:06-07:00 Documentation: typos / spelling fixes in older RelNotes Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 722d88711f14820c32f9adbc1046d142d35bd281 Junio C Hamano gitster@pobox.com 25032ccd5f2fc4f51c0804efa45be19513e04c8a Dmitry Potapov dpotapov@gmail.com http://github.com/git/git/commit/fba5279db904aa49bb75bb31614571b9b6d75b33 fba5279db904aa49bb75bb31614571b9b6d75b33 2008-08-04T21:53:45-07:00 2008-08-04T08:30:24-07:00 correct access right for git-svn-dcommit test The tests requires anonymous write access. Therefore, "anon-access = write" is added to conf/svnserve.conf. But because it was added to the end of the file, it is impossible to guarantee in what section it will be located. It turned out that on SVN 1.5, it was placed in the wrong section and as result the test failed. Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Tested-by: Brad King <brad.king@kitware.com> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 7bfd9971f77438858e412be0219ec78afb3ca46f Junio C Hamano gitster@pobox.com 9751a32a6b964df11f736f3526bf5453e6b5bc85 Abhijit Menon-Sen ams@toroid.org http://github.com/git/git/commit/25032ccd5f2fc4f51c0804efa45be19513e04c8a 25032ccd5f2fc4f51c0804efa45be19513e04c8a 2008-08-04T21:52:08-07:00 2008-08-04T19:11:04-07:00 Fix typos in INSTALL Signed-off-by: Abhijit Menon-Sen <ams@toroid.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 3a286a4b52b5e02c3d39eabe335a78b7038da4cc Junio C Hamano gitster@pobox.com