| 1fdf6ee | Junio C Hamano | 06 August 2008, 19:44:55 UTC | GIT 1.6.0-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 August 2008, 21:00:36 UTC |
| 1fc2cbc | Brandon Casey | 05 August 2008, 23:23:08 UTC | 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> | 06 August 2008, 21:00:36 UTC |
| f44bc33 | Junio C Hamano | 06 August 2008, 20:50:42 UTC | Sync with 1.5.6.5 | 06 August 2008, 20:50:48 UTC |
| 781c183 | Junio C Hamano | 06 August 2008, 19:04:06 UTC | GIT 1.5.6.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 August 2008, 20:40:53 UTC |
| dbd0f5c | Junio C Hamano | 06 August 2008, 18:43:47 UTC | 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> | 06 August 2008, 20:38:18 UTC |
| d96ca27 | Junio C Hamano | 06 August 2008, 20:32:18 UTC | 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 | 06 August 2008, 20:32:18 UTC |
| 847d10f | Junio C Hamano | 06 August 2008, 20:32:12 UTC | 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 | 06 August 2008, 20:32:12 UTC |
| 65ac553 | Junio C Hamano | 06 August 2008, 20:31:38 UTC | Merge branch 'rs/archive-parse-options' * rs/archive-parse-options: archive: allow --exec and --remote without equal sign | 06 August 2008, 20:31:38 UTC |
| eabbc99 | Junio C Hamano | 06 August 2008, 05:32:28 UTC | 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> | 06 August 2008, 06:30:11 UTC |
| ddd63e6 | Steven Grimm | 05 August 2008, 20:08:41 UTC | 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> | 06 August 2008, 04:21:20 UTC |
| 3d32a46 | Brandon Casey | 05 August 2008, 18:01:50 UTC | 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> | 06 August 2008, 04:21:20 UTC |
| 1127c51 | Lee Marlow | 05 August 2008, 05:50:38 UTC | 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> | 06 August 2008, 04:21:20 UTC |
| b1bc149 | Lee Marlow | 05 August 2008, 05:50:37 UTC | 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> | 06 August 2008, 04:21:19 UTC |
| b3191ce | Lee Marlow | 05 August 2008, 05:50:36 UTC | 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> | 06 August 2008, 04:21:19 UTC |
| 95d4378 | Lee Marlow | 05 August 2008, 05:50:35 UTC | 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> | 06 August 2008, 04:21:19 UTC |
| a6c2be2 | Lee Marlow | 05 August 2008, 05:50:34 UTC | 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> | 06 August 2008, 04:21:19 UTC |
| 5dad868 | Lee Marlow | 05 August 2008, 05:50:33 UTC | 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> | 06 August 2008, 04:21:19 UTC |
| 4181c7e | Lee Marlow | 05 August 2008, 05:50:32 UTC | 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> | 06 August 2008, 04:21:19 UTC |
| 3eb1101 | Lee Marlow | 05 August 2008, 05:50:31 UTC | 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> | 06 August 2008, 04:21:19 UTC |
| 8082848 | Eric Wong | 05 August 2008, 07:35:18 UTC | 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> | 06 August 2008, 04:21:19 UTC |
| d9042a0 | David D. Kilzer | 05 August 2008, 07:35:17 UTC | 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> | 06 August 2008, 04:21:19 UTC |
| bd2d4f9 | Eric Wong | 05 August 2008, 07:35:16 UTC | 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> | 06 August 2008, 04:21:19 UTC |
| 1168d40 | Mike Ralphson | 05 August 2008, 16:12:05 UTC | Documentation: typos / spelling fixes Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 August 2008, 04:21:18 UTC |
| 04bb50f | Junio C Hamano | 06 August 2008, 04:21:08 UTC | 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 | 06 August 2008, 04:21:08 UTC |
| 2d0f5f3 | Junio C Hamano | 06 August 2008, 04:20:59 UTC | RelNotes 1.5.6.5 updates Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 August 2008, 04:20:59 UTC |
| 2b6ca6d | Linus Torvalds | 05 August 2008, 18:27:30 UTC | 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> | 06 August 2008, 01:27:31 UTC |
| 3be3999 | Jim Meyering | 05 August 2008, 14:54:42 UTC | 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> | 05 August 2008, 18:40:28 UTC |
| f70f988 | Mike Ralphson | 05 August 2008, 16:12:06 UTC | 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> | 05 August 2008, 18:38:11 UTC |
| fba5279 | Dmitry Potapov | 04 August 2008, 15:30:24 UTC | 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> | 05 August 2008, 04:53:45 UTC |
| 25032cc | Abhijit Menon-Sen | 05 August 2008, 02:11:04 UTC | Fix typos in INSTALL Signed-off-by: Abhijit Menon-Sen <ams@toroid.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 August 2008, 04:52:08 UTC |
| 9751a32 | Abhijit Menon-Sen | 05 August 2008, 02:06:16 UTC | Fix typo in perl/Git.pm Signed-off-by: Abhijit Menon-Sen <ams@toroid.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 August 2008, 04:51:53 UTC |
| 452d36b | Abhijit Menon-Sen | 04 August 2008, 05:02:47 UTC | Fix hash slice syntax error Signed-off-by: Abhijit Menon-Sen <ams@toroid.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 August 2008, 04:51:23 UTC |
| 108c2aa | Abhijit Menon-Sen | 04 August 2008, 11:38:27 UTC | Git.pm: localise $? in command_close_bidi_pipe() Git::DESTROY calls _close_cat_blob and _close_hash_and_insert_object, which in turn call command_close_bidi_pipe, which calls waitpid, which alters $?. If this happens during global destruction, it may alter the program's exit status unexpectedly. Making $? local to the function solves the problem. (The problem was discovered due to a failure of test #8 in t9106-git-svn-commit-diff-clobber.sh.) Signed-off-by: Abhijit Menon-Sen <ams@toroid.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 August 2008, 04:51:17 UTC |
| c72e0db | Lee Marlow | 02 August 2008, 00:56:33 UTC | bash completion: Add completion for 'git grep' Add completions for all long options specified in the docs --cached --text --ignore-case --word-regexp --invert-match --full-name --extended-regexp --basic-regexp --fixed-strings --files-with-matches --name-only --files-without-match --count --and --or --not --all-match 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> | 05 August 2008, 04:48:51 UTC |
| 7d0b18a | Anders Melchiorsen | 04 August 2008, 10:18:40 UTC | Add output flushing before fork() This adds fflush(NULL) before fork() in start_command(), to keep the generic interface safe. A remaining use of fork() with no flushing is in a comment in show_tree(). Rewrite that comment to use start_command(). Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 August 2008, 04:46:42 UTC |
| 9534c9f | Johannes Sixt | 04 August 2008, 20:09:46 UTC | git-gui: Adapt discovery of oguilib to execdir 'libexec/git-core' The new execdir is two levels below the root directory, while the old execdir 'bin' was only one level below. This commit adapts the discovery of oguilib that uses relative paths accordingly. We determine whether we have the extra level in the same way in which the Makefile defines sharedir, i.e. whether the last directory part is 'git-core'. Inspired-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 05 August 2008, 00:38:17 UTC |
| 6119216 | Avery Pennarun | 30 July 2008, 20:53:55 UTC | git-svn: Abort with an error if 'fetch' parameter is invalid. Previously, if a config entry looked like this: svn-remote.svn.fetch=:refs/heads/whatever git-svn would silently do nothing if you asked it to "git svn fetch", and give a strange error if asked to "git svn dcommit". What it really wants is a line that looks like this: svn-remote.svn.fetch=:refs/remotes/whatever So we should simply abort if we get the wrong thing. On the other hand, there's actually no good reason for git-svn to enforce using the refs/remotes namespace, but the code seems to have hardcoded this in several places and I'm not brave enough to try to fix it all right now. Signed-off-by: Avery Pennarun <apenwarr@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 August 2008, 01:13:53 UTC |
| 2c3766f | Anders Melchiorsen | 04 August 2008, 00:30:03 UTC | Flush output in start_async This prevents double output in case stdout is redirected. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 August 2008, 00:55:40 UTC |
| 8eacbc1 | Mikael Magnusson | 03 August 2008, 17:04:21 UTC | gitk: Update swedish translation. Signed-off-by: Paul Mackerras <paulus@samba.org> | 03 August 2008, 23:17:26 UTC |
| 2253776 | Steffen Prohaska | 26 July 2008, 09:41:44 UTC | Modify mingw_main() workaround to avoid link errors With MinGW's gcc.exe (GCC) 3.4.5 (mingw special) GNU ld version 2.17.50 20060824 the old define caused link errors: git.o: In function `main': C:/msysgit/git/git.c:500: undefined reference to `mingw_main' collect2: ld returned 1 exit status The modified define works. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Acked-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 August 2008, 21:18:23 UTC |
| 57b0fc4 | Junio C Hamano | 03 August 2008, 21:14:10 UTC | Merge branch 'maint' * maint: git-name-rev: don't use printf without format | 03 August 2008, 21:14:10 UTC |
| 6612f87 | Johannes Schindelin | 01 August 2008, 14:01:36 UTC | clone --bare: Add ".git" suffix to the directory name to clone into We have a tradition that bare repositories live in directories ending in ".git". To make this more a convention than just a tradition, teach "git clone --bare" to add a ".git" suffix to the directory name. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 August 2008, 21:05:55 UTC |
| fbbdaa5 | Michele Ballabio | 03 August 2008, 11:12:14 UTC | git-gui: add a part about format strings in po/README This should help tranlators that need to reorder words and strings. Original explanation by Christian Stimming. Also remove unneeded backslashes. Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 03 August 2008, 20:53:42 UTC |
| 7cce5b2 | Michele Ballabio | 21 May 2008, 14:09:14 UTC | git-gui: update po/it.po Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 03 August 2008, 20:51:26 UTC |
| 6b31225 | しらいしななこ | 03 August 2008, 08:01:50 UTC | git-gui: update Japanese translation This updates Japanese translation to match the updated git-gui.pot. Signed-off-by: しらいしななこ <nanako3@lavabit.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 03 August 2008, 20:49:53 UTC |
| 7c5b167 | René Scharfe | 03 August 2008, 13:44:33 UTC | git-name-rev: don't use printf without format printf() without an explicit format string is not a good coding practise, unless the printed string is guaranteed to not contain percent signs. While fixing this, we might as well combine the calls to fwrite() and printf(). Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 August 2008, 19:48:41 UTC |
| 12aaf1f | Christian Stimming | 24 May 2008, 20:42:30 UTC | gitk: Updated German translation This includes suggestions by Stephan Beyer. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Paul Mackerras <paulus@samba.org> | 03 August 2008, 12:45:43 UTC |
| d049f6c | Mikael Magnusson | 02 August 2008, 23:46:23 UTC | git-gui: Update swedish translation. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 August 2008, 23:53:15 UTC |
| 807d869 | Giuseppe Bilotta | 02 August 2008, 21:56:44 UTC | diff: chapter and part in funcname for tex This patch enhances the tex funcname by adding support for chapter and part sectioning commands. It also matches the starred version of the sectioning commands. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2008, 22:40:57 UTC |
| b50005b | Avery Pennarun | 01 August 2008, 21:00:15 UTC | Teach "git diff -p" Pascal/Delphi funcname pattern Finds classes, records, functions, procedures, and sections. Most lines need to start at the first column, or else there's no way to differentiate a procedure's definition from its declaration. Signed-off-by: Avery Pennarun <apenwarr@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2008, 22:39:35 UTC |
| ad8c1d9 | Giuseppe Bilotta | 31 July 2008, 07:21:48 UTC | diff: add ruby funcname pattern Provide a regexp that catches class, module and method definitions in Ruby scripts, since the built-in default only finds classes. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2008, 22:38:14 UTC |
| 5cbef01 | Jon Jensen | 02 August 2008, 21:41:48 UTC | Fix reference to Everyday Git, which is an HTML document and not a man page. Signed-off-by: Jon Jensen <jon@endpoint.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2008, 22:35:45 UTC |
| e49b99a | Lee Marlow | 02 August 2008, 00:56:53 UTC | bash completion: Add more long options for 'git log' Options added: --parents --children --full-history 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> | 02 August 2008, 22:22:10 UTC |
| 7339479 | Lee Marlow | 02 August 2008, 04:47:09 UTC | bash completion: remove unused function _git_diff_tree completion for git diff-tree was removed in 5cfb4fe 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> | 02 August 2008, 22:22:10 UTC |
| bc699af | Johannes Schindelin | 02 August 2008, 19:38:56 UTC | clone: Add an option to set up a mirror The command line $ git clone --mirror $URL is now a short-hand for $ git clone --bare $URL $ (cd $(basename $URL) && git remote add --mirror origin $URL) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2008, 22:21:59 UTC |
| 1be7bf6 | Shawn O. Pearce | 02 August 2008, 21:48:33 UTC | git-gui: Update git-gui.pot for 0.11 nearing release Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 August 2008, 21:48:33 UTC |
| 1e5ed42 | Christian Stimming | 02 August 2008, 07:54:51 UTC | git-gui: Update German translation Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 August 2008, 21:09:41 UTC |
| 372c767 | Junio C Hamano | 02 August 2008, 18:58:34 UTC | Merge branch 'maint' * maint: git-name-rev: allow --name-only in combination with --stdin builtin-name-rev.c: split deeply nested part from the main function Conflicts: Documentation/git-name-rev.txt | 02 August 2008, 18:58:34 UTC |
| b003c00 | Pieter de Bie | 31 July 2008, 13:20:34 UTC | git-name-rev: allow --name-only in combination with --stdin Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2008, 18:07:50 UTC |
| e8b55fa | Junio C Hamano | 02 August 2008, 18:04:22 UTC | builtin-name-rev.c: split deeply nested part from the main function The main function of this command implementation tries to do too many things. Split out a handling of single input line into a separate function to reduce nesting level and clutter. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2008, 18:04:22 UTC |
| 2b60326 | Junio C Hamano | 02 August 2008, 06:55:51 UTC | Merge branch 'maint' | 02 August 2008, 06:55:51 UTC |
| e124554 | Junio C Hamano | 02 August 2008, 06:54:01 UTC | Start 1.5.6.5 RelNotes to describe accumulated fixes Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2008, 06:54:01 UTC |
| 69c231f | Ciaran McCreesh | 14 July 2008, 18:29:37 UTC | Make git-add -i accept ranges like 7- git-add -i ranges expect number-number. But for the supremely lazy, typing in that second number when selecting "from patch 7 to the end" is wasted effort. So treat an empty second number in a range as "until the last item". Signed-off-by: Ciaran McCreesh <ciaran.mccreesh@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2008, 06:26:40 UTC |
| 1ceb95c | Junio C Hamano | 21 July 2008, 19:14:42 UTC | Update my e-mail address The old cox.net address is still getting mails from gitters. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2008, 06:21:44 UTC |
| 61d47fe | Jonathan Nieder | 21 July 2008, 18:34:06 UTC | git-diff(1): "--c" -> "--cc" typo fix git diff does not take a --c option. Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2008, 06:21:23 UTC |
| 00332b8 | Pierre Habouzit | 21 July 2008, 18:15:59 UTC | git-submodule: move ill placed shift. When running git submodule update -i, the "-i" is shifted before recursing into cmd_init and then again outside of the loop. This causes some /bin/sh to complain about shifting when there are no arguments left (and would discard anything written after -i too). Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2008, 06:16:38 UTC |
| 734a6ff | Brandon Casey | 22 July 2008, 21:23:31 UTC | t/t4202-log.sh: add newline at end of file Some shells hang when parsing the script if the last statement is not followed by a newline. So add one. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2008, 06:15:02 UTC |
| 11ee57b | Johannes Schindelin | 23 July 2008, 00:51:36 UTC | sort_in_topological_order(): avoid setting a commit flag We used to set the TOPOSORT flag of commits during the topological sorting, but we can just as well use the member "indegree" for it: indegree is now incremented by 1 in the cases where the commit used to have the TOPOSORT flag. This is the same behavior as before, since indegree could not be non-zero when TOPOSORT was unset. Incidentally, this fixes the bug in show-branch where the 8th column was not shown: show-branch sorts the commits in topological order, assuming that all the commit flags are available for show-branch's private matters. But this was not true: TOPOSORT was identical to the flag corresponding to the 8th ref. So the flags for the 8th column were unset by the topological sorting. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2008, 06:14:22 UTC |
| b1264da | Junio C Hamano | 23 July 2008, 23:16:05 UTC | Documentation: clarify diff --cc The definition of an "uninteresting" hunk was not in line with reality. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2008, 06:00:42 UTC |
| 31f4e76 | Steve Haslam | 25 July 2008, 17:51:51 UTC | Propagate -u/--upload-pack option of "git clone" to transport. The -u option to override the remote system's path to git-upload-pack was being ignored by "git clone"; caused by a missing call to transport_set_option to set TRANS_OPT_UPLOADPACK. Presumably this crept in when git-clone was converted from shell to C. Signed-off-by: Steve Haslam <shaslam@lastminute.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2008, 05:49:25 UTC |
| bbff8aa | Anders Melchiorsen | 27 July 2008, 11:12:15 UTC | Documentation: fix diff.external example The diff.external examples pass a flag to gnu-diff, but GNU diff does not follow the GIT_EXTERNAL_DIFF interface. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2008, 05:45:27 UTC |
| b2a5627 | Junio C Hamano | 27 July 2008, 06:15:51 UTC | make sure parsed wildcard refspec ends with slash A wildcard refspec is internally parsed into a refspec structure with src and dst strings. Many parts of the code assumed that these do not include the trailing "/*" when matching the wildcard pattern with an actual ref we see at the remote. What this meant was that we needed to make sure not just that the prefix matched, and also that a slash followed the part that matched. But a codepath that scans the result from ls-remote and finds matching refs forgot to check the "matching part must be followed by a slash" rule. This resulted in "refs/heads/b1" from the remote side to mistakenly match the source side of "refs/heads/b/*:refs/remotes/b/*" refspec. Worse, the refspec crafted internally by "git-clone", and a hardcoded preparsed refspec that is used to implement "git-fetch --tags", violated this "parsed widcard refspec does not end with slash" rule; simply adding the "matching part must be followed by a slash" rule then would have broken codepaths that use these refspecs. This commit changes the rule to require a trailing slash to parsed wildcard refspecs. IOW, "refs/heads/b/*:refs/remotes/b/*" is parsed as src = "refs/heads/b/" and dst = "refs/remotes/b/". This allows us to simplify the matching logic because we only need to do a prefixcmp() to notice "refs/heads/b/one" matches and "refs/heads/b1" does not. Acked-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2008, 05:41:15 UTC |
| d65d2b2 | Jeff King | 28 July 2008, 06:02:04 UTC | init: handle empty "template" parameter If a user passes "--template=", then our template parameter is blank. Unfortunately, copy_templates() assumes it has at least one character, and does all sorts of bad things like reading from template[-1] and then proceeding to link all of '/' into the .git directory. This patch just checks for that condition in copy_templates and aborts. As a side effect, this means that --template= now has the meaning "don't copy any templates." Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2008, 05:41:07 UTC |
| 1e5f7ad | Stephan Beyer | 02 August 2008, 01:51:21 UTC | builtin-revert.c: typofix Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 August 2008, 04:10:40 UTC |
| 0fe8c13 | Pierre Habouzit | 31 July 2008, 10:22:23 UTC | Allow "non-option" revision options in parse_option-enabled commands Commands which use parse_options() but also call setup_revisions() must do their parsing in a two step process: 1. first, they parse all options. Anything unknown goes to parse_revision_opt() (which calls handle_revision_opt), which may claim the option or say "I don't recognize this" 2. the non-option remainder goes to setup_revisions() to actually get turned into revisions Some revision options are "non-options" in that they must be parsed in order with their revision counterparts in setup_revisions(). For example, "--all" functions as a pseudo-option expanding to all refs, and "--no-walk" affects refs after it on the command line, but not before. The revision option parser in step 1 recognizes such options and sets them aside for later parsing by setup_revisions(). However, the return value used from handle_revision_opt indicated "I didn't recognize this", which was wrong. It did, and it took appropriate action (even though that action was just deferring it for later parsing). Thus it should return "yes, I recognized this." Previously, these pseudo-options generated an error when used with parse_options parsers (currently just blame and shortlog). With this patch, they should work fine, enabling things like "git shortlog --all". Signed-off-by: Jeff King <peff@peff.net> Acked-By: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 July 2008, 18:35:17 UTC |
| b3123f9 | Junio C Hamano | 31 July 2008, 07:05:22 UTC | Teach --find-copies-harder to "git blame" It's equivalent to "-C -C" with the diff family. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 July 2008, 18:22:12 UTC |
| fdc7c81 | Jeff King | 31 July 2008, 07:36:09 UTC | Compact commit template message We recently let the user know explicitly that an empty commit message will abort the commit. However, this adds yet another line to the template; let's rephrase and re-wrap so that this fits back on two lines. This patch also makes the "fatal: empty commit message?" warning a bit less scary, since this is now a "feature" instead of an error. However, we retain the non-zero exit status to indicate to callers that nothing was committed. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 July 2008, 18:20:13 UTC |
| 835e62a | Alexander Gavrilov | 26 July 2008, 16:15:54 UTC | gitk: Fallback to selecting the head commit upon load Try selecting the head, if the previously selected commit is not available in the new view. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org> | 31 July 2008, 10:29:44 UTC |
| 567c34e | Alexander Gavrilov | 26 July 2008, 16:13:45 UTC | gitk: Fixed automatic row selection during load - Switching views now actually preserves the selected commit. - Reloading (also Edit View) preserves the currently selected commit. - Initial selection does not produce weird scrolling. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org> | 31 July 2008, 10:29:44 UTC |
| 7272131 | Alexander Gavrilov | 26 July 2008, 14:48:41 UTC | gitk: Fixed broken exception handling in diff If the tree diff command failed to start for some random reason, treepending remained set, and thus no more diffs were shown after that. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org> | 31 July 2008, 10:29:44 UTC |
| b6326e9 | Alexander Gavrilov | 14 July 2008, 20:35:42 UTC | gitk: On Windows, use a Cygwin-specific flag for kill MSysGit compiles git binaries as native Windows executables, so they cannot be killed unless a special flag is specified. This flag is implemented by the Cygwin version of kill, which is also included in MSysGit. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org> | 31 July 2008, 10:29:44 UTC |
| e439e09 | Alexander Gavrilov | 13 July 2008, 12:40:47 UTC | gitk: Arrange to kill diff-files & diff-index on quit Local change analysis can take a noticeable amount of time on large file sets, and produce no output if there are no changes. Register the back-ends in commfd, so that they get properly killed on window close. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org> | 31 July 2008, 10:29:44 UTC |
| e2f90ee | Alexander Gavrilov | 12 July 2008, 12:09:28 UTC | gitk: Kill back-end processes on window close When collecting commits for a rarely changed, or recently created file or directory, rev-list may work for a noticeable period of time without producing any output. Such processes don't receive SIGPIPE for a while after gitk is closed, thus becoming runaway CPU hogs. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org> | 31 July 2008, 10:29:44 UTC |
| f448e24 | Abhijit Menon-Sen | 30 July 2008, 09:33:43 UTC | Make the DESCRIPTION match <x>... items in the SYNOPSIS When the SYNOPSIS says e.g. "<path>...", it is nice if the DESCRIPTION also mentions "<path>..." and says the specified "paths" (note plural) are used for $whatever. This fixes the obvious mismatches. Signed-off-by: Abhijit Menon-Sen <ams@toroid.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 July 2008, 04:42:55 UTC |
| 0e25790 | Christian Couder | 31 July 2008, 03:22:40 UTC | documentation: user-manual: update "using-bisect" section Since version 1.5.6 "git bisect" doesn't use a "bisect" branch any more, but the user manual had not been updated to reflect this. So this patch does that and while at it also adds a few words about "git bisect skip" and points user to the "git bisect" man page for more information. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 July 2008, 04:42:20 UTC |
| c4aca9c | Junio C Hamano | 30 July 2008, 19:53:45 UTC | Fix test-parse-options "integer" test OPT_INTEGER() works on an integer, not on an unsigned long. On a big endian architecture with long larger than int, integer test gives bogus results because of this bug. Reported by H.Merijn Brand in HP-UX 64-bit environment. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2008, 19:53:45 UTC |
| 5354a56 | Todd Zullinger | 30 July 2008, 17:48:33 UTC | Replace uses of "git-var" with "git var" Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2008, 18:42:01 UTC |
| 9b6bf4d | Junio C Hamano | 30 July 2008, 08:12:19 UTC | Fix merge name generation in "merge in C" When merging an early part of a branch, e.g. "git merge xyzzy~20", we were supposed to say "branch 'xyzzy' (early part)", but it incorrectly said "branch 'refs/heads/xy' (early part)" instead. The logic was supposed to first strip away "~20" part to make sure that what follows "~" is a non-zero posint, prefix it with "refs/heads/" and ask resolve_ref() if it is a ref. If it is, then we know xyzzy was a branch, and we can give the correct message. However, there were a few bugs. First of all, the logic to build this "true branch refname" did not count the characters correctly. At this point of the code, "len" is the number of trailing, non-name part of the given extended SHA-1 expression given by the user, i.e. number of bytes in "~20" in the above example. In addition, the message forgot to skip "refs/heads/" it prefixed from the output. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2008, 08:13:26 UTC |
| 81b237d | Cesar Eduardo Barros | 27 July 2008, 00:46:00 UTC | Documentation/git-rev-parse.txt: update for new git-describe output format Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2008, 07:19:22 UTC |
| 731ab1f | Junio C Hamano | 30 July 2008, 07:18:26 UTC | Merge git://repo.or.cz/git-gui * git://repo.or.cz/git-gui: git-gui (Windows): Change wrapper to execdir 'libexec/git-core' git-gui (Windows): Switch to relative discovery of oguilib git-gui: Correct installation of library to be $prefix/share git-gui: Fix gitk search in $PATH to work on Windows git-gui: Preserve scroll position on reshow_diff. git-gui: Fix the Remote menu separator. | 30 July 2008, 07:18:26 UTC |
| 4fac1d3 | Rene Scharfe | 25 July 2008, 10:41:26 UTC | archive: allow --exec and --remote without equal sign Convert git archive to parse_options(). The parameters --remote and --exec are still handled by their special parser. Define them anyway in order for them to show up in the usage notice. Note: in a command like "git archive --prefix --remote=a/ HEAD", the string "--remote=a/" will be interpreted as a remote option, not a prefix, because that special parser sees it first. If one needs such a strange prefix, it needs to be specified like this: "git archive --prefix=--remote=a/ HEAD" (with an equal sign). Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2008, 07:15:14 UTC |
| c70115b | Junio C Hamano | 29 July 2008, 08:13:44 UTC | Teach gitlinks to ie_modified() and ce_modified_check_fs() The ie_modified() function is the workhorse for refresh_cache_entry(), i.e. checking if an index entry that is stat-dirty actually has changes. After running quicker check to compare cached stat information with results from the latest lstat(2) to answer "has modification" early, the code goes on to check if there really is a change by comparing the staged data with what is on the filesystem by asking ce_modified_check_fs(). However, this function always said "no change" for any gitlinks that has a directory at the corresponding path. This made ie_modified() to miss actual changes in the subproject. The patch fixes this first by modifying an existing short-circuit logic before calling the ce_modified_check_fs() function. It knows that for any filesystem entity to which ie_match_stat() says its data has changed, if its cached size is nonzero then the contents cannot match, which is a correct optimization only for blob objects. We teach gitlink objects to this special case, as we already know that any gitlink that ie_match_stat() says is modified is indeed modified at this point in the codepath. With the above change, we could leave ce_modified_check_fs() broken, but it also futureproofs the code by teaching it to use ce_compare_gitlink(), instead of assuming (incorrectly) that any directory is unchanged. Originally noticed by Alex Riesen on Cygwin. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2008, 07:09:22 UTC |
| bd2574c | Anders Melchiorsen | 29 July 2008, 20:12:22 UTC | Advertise the ability to abort a commit This treats aborting a commit more like a feature. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2008, 07:00:02 UTC |
| ae7c5dc | Alexander Gavrilov | 26 July 2008, 20:52:54 UTC | Support copy and rename detection in fast-export. Although it does not matter for Git itself, tools that export to systems that explicitly track copies and renames can benefit from such information. This patch makes fast-export output correct action logs when -M or -C are enabled. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2008, 06:57:51 UTC |
| 6b2fbaa | Kevin Ballard | 30 July 2008, 05:49:33 UTC | format-patch: Produce better output with --inline or --attach This patch makes two small changes to improve the output of --inline and --attach. The first is to write a newline preceding the boundary. This is needed because MIME defines the encapsulation boundary as including the preceding CRLF (or in this case, just LF), so we should be writing one. Without this, the last newline in the pre-diff content is consumed instead. The second change is to always write the line termination character (default: newline) even when using --inline or --attach. This is simply to improve the aesthetics of the resulting message. When using --inline an email client should render the resulting message identically to the non-inline version. And when using --attach this adds a blank line preceding the attachment in the email, which is visually attractive. Signed-off-by: Kevin Ballard <kevin@sb.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2008, 06:18:15 UTC |
| 8cb070a | Brian Gernhardt | 30 July 2008, 01:16:01 UTC | Documentation: Remove mentions of git-svnimport. git-svnimport is no longer supported, so don't mention it in the documentation. This also updates the description, removing the historical discussion, since it mostly dealt with how it differed from svnimport. The new description gives some starting points into the rest of the documentation. Noticed by Jurko Gospodnetić <jurko.gospodnetic@docte.hr> Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2008, 06:18:04 UTC |
| 2c9693b | Abhijit Menon-Sen | 29 July 2008, 23:13:38 UTC | Make it clear that push can take multiple refspecs Signed-off-by: Abhijit Menon-Sen <ams@toroid.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2008, 06:18:04 UTC |
| a56bf58 | Abhijit Menon-Sen | 29 July 2008, 19:53:16 UTC | `git submodule add` now requires a <path> Signed-off-by: Abhijit Menon-Sen <ams@toroid.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2008, 06:18:04 UTC |
| 5fc6eda | Steffen Prohaska | 27 July 2008, 16:49:43 UTC | git-gui (Windows): Change wrapper to execdir 'libexec/git-core' git-gui needs bindir in PATH to be able to run 'git'. bindir however is not necessarily in PATH if started directly through a Windows shortcut. Therefore, we used to add the directory git-gui is located in. But with the new 'libexec/git-core' layout this directory is no longer identical to bindir. This commit modifies the wrapper script to discover the bindir and add it to PATH. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 July 2008, 05:43:37 UTC |
| f57ddcc | Steffen Prohaska | 27 July 2008, 16:49:42 UTC | git-gui (Windows): Switch to relative discovery of oguilib Instead of using an absolute path, git-gui can discover its gui library using a relative path from execdir. We want to use the relative path discovery on MinGW to avoid issues with translation of absolute paths. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 30 July 2008, 05:43:37 UTC |
