| 4133fd2 | Junio C Hamano | 10 February 2010, 21:44:11 UTC | Git 1.6.6.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2010, 21:44:11 UTC |
| 216d2e0 | Junio C Hamano | 10 February 2010, 21:42:48 UTC | Merge branch 'maint-1.6.5' into maint * maint-1.6.5: t8003: check exit code of command and error message separately | 10 February 2010, 21:42:48 UTC |
| 33f0ea4 | Junio C Hamano | 09 February 2010, 18:06:33 UTC | t8003: check exit code of command and error message separately Shell reports exit status only from the most downstream command in a pipeline. In these tests, we want to make sure that the command fails in a controlled way, and produces a correct error message. This issue was known by Jay who submitted the patch, and also was pointed out by Hannes during the review process, but I forgot to fix it up before applying. Sorry about that. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2010, 21:42:29 UTC |
| 57ffc0e | Junio C Hamano | 10 February 2010, 21:32:20 UTC | Merge branch 'sp/maint-fast-import-large-blob' into maint * sp/maint-fast-import-large-blob: fast-import: Stream very large blobs directly to pack | 10 February 2010, 21:32:20 UTC |
| 800d1fb | Junio C Hamano | 10 February 2010, 21:02:52 UTC | Merge branch 'gp/maint-cvsserver' into maint * gp/maint-cvsserver: git-cvsserver: allow regex metacharacters in CVSROOT | 10 February 2010, 21:02:52 UTC |
| 410e99f | Junio C Hamano | 10 February 2010, 21:02:43 UTC | Merge branch 'jc/maint-reflog-bad-timestamp' into maint * jc/maint-reflog-bad-timestamp: t0101: use a fixed timestamp when searching in the reflog Update @{bogus.timestamp} fix not to die() approxidate_careful() reports errorneous date string | 10 February 2010, 21:02:43 UTC |
| c329898 | Junio C Hamano | 10 February 2010, 21:02:16 UTC | Merge branch 'il/maint-xmallocz' into maint * il/maint-xmallocz: Fix integer overflow in unpack_compressed_entry() Fix integer overflow in unpack_sha1_rest() Fix integer overflow in patch_delta() Add xmallocz() | 10 February 2010, 21:02:16 UTC |
| b0e67ff | Junio C Hamano | 10 February 2010, 21:02:05 UTC | Merge branch 'jh/maint-config-file-prefix' into maint * jh/maint-config-file-prefix: builtin-config: Fix crash when using "-f <relative path>" from non-root dir | 10 February 2010, 21:02:05 UTC |
| 2e9d733 | Junio C Hamano | 10 February 2010, 21:01:55 UTC | Merge branch 'nd/include-termios-for-osol' into maint * nd/include-termios-for-osol: Add missing #include to support TIOCGWINSZ on Solaris | 10 February 2010, 21:01:55 UTC |
| a42332c | Junio C Hamano | 10 February 2010, 20:54:15 UTC | Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maint * jc/maint-1.6.1-checkout-m-custom-merge: checkout -m path: fix recreating conflicts Conflicts: t/t7201-co.sh | 10 February 2010, 20:54:15 UTC |
| c6eba1d | Junio C Hamano | 10 February 2010, 20:52:39 UTC | Merge branch 'rs/maint-archive-match-pathspec' into maint * rs/maint-archive-match-pathspec: archive: complain about path specs that don't match anything | 10 February 2010, 20:52:39 UTC |
| 8ff8830 | Junio C Hamano | 10 February 2010, 18:18:55 UTC | check-ref-format documentation: fix enumeration mark-up The last item in the enumerated refname rule was mistakenly made into a sub-item of the 7th one. It should be the 8th one in the list on its own. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2010, 18:19:13 UTC |
| e33cc59 | Junio C Hamano | 09 February 2010, 05:53:54 UTC | Merge branch 'maint-1.6.5' into maint * maint-1.6.5: blame: prevent a segv when -L given start > EOF | 09 February 2010, 05:53:54 UTC |
| 92f9e27 | Jay Soffian | 09 February 2010, 03:48:13 UTC | blame: prevent a segv when -L given start > EOF blame would segv if given -L <lineno> with <lineno> past the end of the file. While we're fixing the bug, add test cases for an invalid <start> when called as -L <start>,<end> or -L<start>. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 February 2010, 05:52:44 UTC |
| a598331 | Junio C Hamano | 09 February 2010, 00:49:22 UTC | Merge branch 'jc/maint-push-doc-status' into maint * jc/maint-push-doc-status: git-push: document all the status flags used in the output | 09 February 2010, 00:49:22 UTC |
| b7047ab | Junio C Hamano | 09 February 2010, 00:45:21 UTC | git-push: document all the status flags used in the output We didn't talk about '-' (deletion), '*' (addition), nor '+' (forced). Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 February 2010, 00:49:00 UTC |
| 0c15da6 | Junio C Hamano | 08 February 2010, 23:09:19 UTC | Merge branch 'jc/maint-imap-config-parse' into maint * jc/maint-imap-config-parse: Fix parsing of imap.preformattedHTML and imap.sslverify | 08 February 2010, 23:09:19 UTC |
| ace706e | Junio C Hamano | 06 February 2010, 19:26:35 UTC | Fix parsing of imap.preformattedHTML and imap.sslverify These two variables are boolean and can lack "= value" in the configuration file. Do not reject such input early in the parser callback function. Also the key are downcased before being given to the callback, so we should run strcmp() with keyword spelled in all-lowercase. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 February 2010, 23:08:31 UTC |
| 35da43e | Junio C Hamano | 08 February 2010, 20:13:56 UTC | Merge branch 'jc/maint-doc-git-add-example' into maint * jc/maint-doc-git-add-example: git-add documentation: Fix shell quoting example | 08 February 2010, 20:13:56 UTC |
| bf7cbb2 | Junio C Hamano | 08 February 2010, 20:12:41 UTC | git-add documentation: Fix shell quoting example When 921177f (Documentation: improve "add", "pull" and "format-patch" examples, 2008-05-07) converted this from enumeration header to displayed text, it failed to adjust for the AsciiDoc's rule to quote backslashes. In displayed text, backslash is shown verbatim, while in enumeration header, we need to double it. We have a similar construct in git-rm.txt documentation, and need to be careful when somebody wants to update it to match the style of the "git add" example. Noticed by: Greg Bacon <gbacon@dbresearch.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 February 2010, 20:12:41 UTC |
| fe12d8e | René Scharfe | 07 February 2010, 23:30:20 UTC | archive: simplify archive format guessing The code to guess an output archive's format consumed any --format options and built a new one. Jonathan noticed that it does so in an unsafe way, risking to overflow the static buffer fmt_opt. Change the code to keep the existing --format options intact and to only add a new one if a format could be guessed based on the output file name. The new option is added as the first one, allowing the existing ones to overrule it, i.e. explicit --format options given on the command line win over format guesses, as before. To simplify the code further, format_from_name() is changed to return the full --format option, thus no potentially dangerous sprintf() calls are needed any more. Reported-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 February 2010, 23:40:27 UTC |
| 2b26e0e | Wesley J. Landaker | 05 February 2010, 19:58:50 UTC | Update git fsck --full short description to mention packs The '--full' option to git fsck does two things: 1) Check objects in packs 2) Check alternate objects This is documented in the git fsck manual; this patch reflects that in the short git fsck option help message as well. Signed-off-by: Wesley J. Landaker <wjl@icecavern.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2010, 21:01:45 UTC |
| b401a12 | Junio C Hamano | 05 February 2010, 18:59:05 UTC | Merge branch 'jc/maint-limit-note-output' into maint * jc/maint-limit-note-output: Fix "log --oneline" not to show notes Fix "log" family not to be too agressive about showing notes | 05 February 2010, 18:59:05 UTC |
| 5eef828 | Shawn O. Pearce | 01 February 2010, 17:27:35 UTC | fast-import: Stream very large blobs directly to pack If a blob is larger than the configured big-file-threshold, instead of reading it into a single buffer obtained from malloc, stream it onto the end of the current pack file. Streaming the larger objects into the pack avoids the 4+ GiB memory footprint that occurs when fast-import is processing 2+ GiB blobs. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 February 2010, 20:09:47 UTC |
| 153559a | Junio C Hamano | 01 February 2010, 08:06:11 UTC | Merge branch 'sb/maint-octopus' into maint-1.6.5 * sb/maint-octopus: octopus: remove dead code octopus: reenable fast-forward merges octopus: make merge process simpler to follow | 01 February 2010, 08:06:11 UTC |
| 4b68365 | Junio C Hamano | 01 February 2010, 08:04:12 UTC | Merge branch 'bg/maint-add-all-doc' into maint-1.6.5 * bg/maint-add-all-doc: git-rm doc: Describe how to sync index & work tree git-add/rm doc: Consistently back-quote Documentation: 'git add -A' can remove files | 01 February 2010, 08:04:12 UTC |
| 3325cea | Junio C Hamano | 30 January 2010, 07:36:13 UTC | Merge branch 'maint-1.6.5' into maint * maint-1.6.5: fix memcpy of overlapping area | 30 January 2010, 07:36:13 UTC |
| 65d41d4 | Jeff King | 29 January 2010, 10:28:44 UTC | fix memcpy of overlapping area Caught by valgrind in t5500, but it is pretty obvious from reading the code that this is shifting elements of an array to the left, which needs memmove. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 January 2010, 17:52:21 UTC |
| 63d04a7 | SZEDER Gábor | 22 January 2010, 10:54:51 UTC | bash: don't offer remote transport helpers as subcommands Since commits a2d725b7 (Use an external program to implement fetching with curl, 2009-08-05) and c9e388bb (Make the "traditionally-supported" URLs a special case, 2009-09-03) remote transport helpers like 'remote-ftp' and 'remote-curl' are offered by the completion script as available subcommands. Not good, since they are helpers, therefore should not be offered, so filter them out. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 January 2010, 20:36:12 UTC |
| 6c647af | Junio C Hamano | 27 January 2010, 18:54:22 UTC | t0101: use a fixed timestamp when searching in the reflog That will give us a better reproducibility during tests. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2010, 18:54:30 UTC |
| a5e10ac | Junio C Hamano | 27 January 2010, 18:53:09 UTC | Update @{bogus.timestamp} fix not to die() The caller will say "It is not a valid object name" if it wants to, and some callers may even try to see if it names an object and otherwise try to see if it is a path. Pointed out by Jeff King. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2010, 18:53:09 UTC |
| 93cfa7c | Junio C Hamano | 26 January 2010, 19:58:00 UTC | approxidate_careful() reports errorneous date string For a long time, the time based reflog syntax (e.g. master@{yesterday}) didn't complain when the "human readable" timestamp was misspelled, as the underlying mechanism tried to be as lenient as possible. The funny thing was that parsing of "@{now}" even relied on the fact that anything not recognized by the machinery returned the current timestamp. Introduce approxidate_careful() that takes an optional pointer to an integer, that gets assigned 1 when the input does not make sense as a timestamp. As I am too lazy to fix all the callers that use approxidate(), most of the callers do not take advantage of the error checking, but convert the code to parse reflog to use it as a demonstration. Tests are mostly from Jeff King. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 January 2010, 21:51:41 UTC |
| 4ab07e4 | Ilari Liusvaara | 26 January 2010, 18:24:15 UTC | Fix integer overflow in unpack_compressed_entry() Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 January 2010, 21:00:16 UTC |
| 3aee68a | Ilari Liusvaara | 26 January 2010, 18:24:14 UTC | Fix integer overflow in unpack_sha1_rest() [jc: later NUL termination by the caller becomes unnecessary] Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 January 2010, 21:00:10 UTC |
| 222083a | Ilari Liusvaara | 26 January 2010, 18:24:13 UTC | Fix integer overflow in patch_delta() Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 January 2010, 20:57:59 UTC |
| 5bf9219 | Ilari Liusvaara | 26 January 2010, 18:24:12 UTC | Add xmallocz() Add routine for allocating NUL-terminated memory block without risking integer overflow in addition of +1 for NUL byte. [jc: with suggestion from Bill Lear] Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 January 2010, 20:57:53 UTC |
| f9acaea | Gerrit Pape | 26 January 2010, 14:47:16 UTC | git-cvsserver: allow regex metacharacters in CVSROOT When run in a repository with a path name containing regex metacharacters (e.g. +), git-cvsserver failed to split the client request into CVSROOT and module. Now metacharacters are disabled for the value of CVSROOT in the perl regex so that directory names containing metacharacters are handled properly. Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 January 2010, 20:54:18 UTC |
| 65807ee | Johan Herland | 26 January 2010, 15:02:16 UTC | builtin-config: Fix crash when using "-f <relative path>" from non-root dir When your current directory is not at the root of the working tree, and you use the "-f" option with a relative path, the current code tries to read from a wrong file, since argv[2] is now beyond the end of the rearranged argument list. This patch replaces the incorrect argv[2] with the variable holding the given config file name. The bug was introduced by d64ec16 (git config: reorganize to use parseopt). [jc: added test] Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 January 2010, 19:20:06 UTC |
| b30ccd7 | Junio C Hamano | 24 January 2010, 19:16:26 UTC | Merge branch 'maint' of git://git.spearce.org/git-gui into maint * 'maint' of git://git.spearce.org/git-gui: git-gui: work from the .git dir git-gui: Fix applying a line when all following lines are deletions git-gui: Correct file_states when unstaging partly staged entry git-gui: Fix gitk for branch whose name matches local file git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in sync git-gui: handle really long error messages in updateindex. git-gui: Add hotkeys for "Unstage from commit" and "Revert changes" git-gui: Makefile: consolidate .FORCE-* targets | 24 January 2010, 19:16:26 UTC |
| 87cd09f | Giuseppe Bilotta | 23 January 2010, 10:03:36 UTC | git-gui: work from the .git dir When git-gui is run from a .git dir, _gitdir would be set to "." by rev-parse, something that confuses the worktree detection. Fix by expanding the value of _gitdir to pwd in this special case. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 January 2010, 23:14:04 UTC |
| 390425b | Jeff Epler | 08 December 2009, 00:22:42 UTC | git-gui: Fix applying a line when all following lines are deletions If a diff looked like: @@ context -del1 -del2 and you wanted to stage the deletion 'del1', the generated patch wouldn't apply because it was missing the line 'del2' converted to context, but this line was counted in the @@-line Signed-off-by: Jeff Epler <jepler@unpythonic.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 January 2010, 23:00:09 UTC |
| 7ec2b69 | Jens Lehmann | 07 December 2009, 20:35:59 UTC | git-gui: Correct file_states when unstaging partly staged entry When unstaging a partly staged file or submodule, the file_states list was not updated properly (unless unstaged linewise). Its index_info part did not contain the former head_info as it should have but kept its old value. This seems not to have had any bad effects but diminishes the value of the file_states list for future enhancements. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 January 2010, 22:46:13 UTC |
| e27d106 | Peter Krefting | 21 January 2010, 12:15:17 UTC | git-gui: Fix gitk for branch whose name matches local file When trying to run gitk on a branch name whose name matches a local file, it will toss an error saying that the name is ambiguous. Adding a pair of dashes will make gitk parse the options to the left of it as branch names. Since wish eats the first pair of dashes we throw at it, we need to add a second one to ensure they get through. Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 January 2010, 22:46:12 UTC |
| 3c6a287 | Christopher Beelby | 23 January 2010, 22:37:17 UTC | git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in sync When the number of recent repo's gets to ten there can be a situation where an item is removed from the .gitconfig file via a call to git config --unset, but the internal representation of that file (repo_config(gui.recentrepo)) is not updated. Then a subsequent attempt to remove an item from the list fails because git-gui attempts to call --unset on a value that has already been removed. This leads to duplicates in the .gitconfig file, which then also cause errors if the git-gui tries to --unset them (rather than using --unset-all. --unset-all is not used because it is not expected that duplicates should ever be allowed to exist.) When loading the list of recent repositories (proc _get_recentrepos) if a repo in the list is not considered a valid git reposoitory then we should go ahead and remove it so it doesn't take up a slot in the list (since we limit to 10 items). This will prevent a bunch of invalid entries in the list (which are not shown) from making valid entries dissapear off the list even when there are less than ten valid entries. See: http://code.google.com/p/msysgit/issues/detail?id=362 Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 January 2010, 22:46:12 UTC |
| ea888f8 | Pat Thoyts | 20 December 2009, 02:02:03 UTC | git-gui: handle really long error messages in updateindex. As reported to msysGit (bug #340) it is possible to get some very long error messages when updating the index. The use of a label to display this prevents scrolling the output. This patch replaces the label with a scrollable text widget configured to look like a label. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 January 2010, 22:22:28 UTC |
| 288123f | Junio C Hamano | 22 January 2010, 03:05:19 UTC | ignore duplicated slashes in make_relative_path() The function takes two paths, an early part of abs is supposed to match base; otherwise abs is not a path under base and the function returns the full path of abs. The caller can easily confuse the implementation by giving duplicated and needless slashes in these path arguments. Credit for test script, motivation and initial patch goes to Thomas Rast. A follow-up fix (squashed) is by Hannes. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 January 2010, 23:34:56 UTC |
| 19c6a4f | Junio C Hamano | 22 January 2010, 00:38:56 UTC | merge-recursive: do not return NULL only to cause segfault merge-recursive calls write_tree_from_memory() to come up with a virtual tree, with possible conflict markers inside the blob contents, while merging multiple common ancestors down. It is a bug to call the function with unmerged entries in the index, even if the merge to come up with the common ancestor resulted in conflicts. Otherwise the result won't be expressible as a tree object. We _might_ want to suggest the user to set GIT_MERGE_VERBOSITY to 5 and re-run the merge in the message. At least we will know which part of process_renames() or process_entry() functions is not correctly handling the unmerged paths, and it might help us diagnosing the issue. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 January 2010, 01:02:30 UTC |
| 703e6e7 | Tay Ray Chuan | 21 January 2010, 14:41:00 UTC | retry request without query when info/refs?query fails When "info/refs" is a static file and not behind a CGI handler, some servers may not handle a GET request for it with a query string appended (eg. "?foo=bar") properly. If such a request fails, retry it sans the query string. In addition, ensure that the "smart" http protocol is not used (a service has to be specified with "?service=<service name>" to be conformant). Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Reported-and-tested-by: Yaroslav Halchenko <debian@onerussian.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 January 2010, 23:01:37 UTC |
| 7dccadf | Junio C Hamano | 21 January 2010, 22:57:41 UTC | Fix "log --oneline" not to show notes This option should be treated pretty much the same as --format="%h %s". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 January 2010, 22:57:41 UTC |
| 8f376a5 | Junio C Hamano | 21 January 2010, 04:25:11 UTC | Merge branch 'jc/maint-refresh-index-is-optional-for-status' into maint * jc/maint-refresh-index-is-optional-for-status: status: don't require the repository to be writable | 21 January 2010, 04:25:11 UTC |
| 66b2ed0 | Junio C Hamano | 20 January 2010, 21:59:36 UTC | Fix "log" family not to be too agressive about showing notes Giving "Notes" information in the default output format of "log" and "show" is a sensible progress (the user has asked for it by having the notes), but for some commands (e.g. "format-patch") spewing notes into the formatted commit log message without being asked is too aggressive. Enable notes output only for "log", "show", "whatchanged" by default and only when the user didn't ask any specific --pretty/--format from the command line; users can explicitly override this default with --show-notes and --no-notes option. Parts of tests are taken from Jeff King's fix. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 January 2010, 03:57:02 UTC |
| 9504f3d | Junio C Hamano | 20 January 2010, 21:29:21 UTC | Git 1.6.6.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 January 2010, 21:29:21 UTC |
| 66276d9 | Junio C Hamano | 20 January 2010, 21:23:59 UTC | Merge branch 'bg/maint-remote-update-default' into maint * bg/maint-remote-update-default: Fix "git remote update" with remotes.defalt set | 20 January 2010, 21:23:59 UTC |
| ce67b3e | Junio C Hamano | 20 January 2010, 21:02:24 UTC | Merge branch 'sb/maint-octopus' into maint * sb/maint-octopus: octopus: remove dead code octopus: reenable fast-forward merges octopus: make merge process simpler to follow Conflicts: git-merge-octopus.sh | 20 January 2010, 21:02:24 UTC |
| cae7151 | Junio C Hamano | 20 January 2010, 21:01:33 UTC | Merge branch 'bg/maint-add-all-doc' into maint * bg/maint-add-all-doc: git-rm doc: Describe how to sync index & work tree git-add/rm doc: Consistently back-quote Documentation: 'git add -A' can remove files | 20 January 2010, 21:01:33 UTC |
| f0b0d78 | Junio C Hamano | 20 January 2010, 21:01:19 UTC | Merge branch 'maint-1.6.5' into maint * maint-1.6.5: Git 1.6.5.8 Fix mis-backport of t7002 bash completion: factor submodules into dirty state reset: unbreak hard resets with GIT_WORK_TREE Conflicts: Documentation/git.txt GIT-VERSION-GEN RelNotes | 20 January 2010, 21:01:19 UTC |
| 35eabd1 | Junio C Hamano | 20 January 2010, 20:44:59 UTC | Git 1.6.5.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 January 2010, 20:44:59 UTC |
| 806e5c8 | Junio C Hamano | 20 January 2010, 20:22:58 UTC | Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5 * jk/maint-1.6.5-reset-hard: reset: unbreak hard resets with GIT_WORK_TREE | 20 January 2010, 20:22:58 UTC |
| 91d23be | Junio C Hamano | 20 January 2010, 20:22:54 UTC | Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes' into maint-1.6.5 * tr/maint-1.6.5-bash-prompt-show-submodule-changes: bash completion: factor submodules into dirty state | 20 January 2010, 20:22:54 UTC |
| e770655 | Junio C Hamano | 20 January 2010, 20:17:24 UTC | Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint-1.6.5 * dp/maint-1.6.5-fast-import-non-commit-tag: fast-import: tag may point to any object type | 20 January 2010, 20:17:24 UTC |
| 27132ca | Junio C Hamano | 20 January 2010, 20:16:46 UTC | Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint-1.6.5 * jm/maint-1.6.5-grep-NUL-terminate: grep: NUL terminate input from a file | 20 January 2010, 20:16:46 UTC |
| ab68545 | Junio C Hamano | 20 January 2010, 01:10:35 UTC | status: don't require the repository to be writable We need to update the index before hooks run when actually making a commit, but we shouldn't have to write the index when running "status". If we can, then we have already spent cycles to refresh the index and it is a waste not to write it out, but it is not a disaster if we cannot write it out. The main reason the user is running "git status" is to get the "status", and refreshing the index is a mere side effect that we can do without. Discovery and initial attempted fix by Dscho. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 January 2010, 01:10:35 UTC |
| 6329bad | David Ripton | 19 January 2010, 15:13:33 UTC | bisect: fix singular/plural grammar nit Remove the trailing 's' from "revisions" and "steps" when there is only one. Signed-off-by: David Ripton <dripton@ripton.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 January 2010, 20:50:48 UTC |
| 03c6e97 | Junio C Hamano | 19 January 2010, 05:37:12 UTC | Merge branch 'maint-1.6.4' into maint-1.6.5 * maint-1.6.4: Fix mis-backport of t7002 base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname". textconv: stop leaking file descriptors commit: --cleanup is a message option git count-objects: handle packs bigger than 4G t7102: make the test fail if one of its check fails | 19 January 2010, 05:37:12 UTC |
| 814035c | Junio C Hamano | 19 January 2010, 05:37:06 UTC | Merge branch 'maint-1.6.3' into maint-1.6.4 * maint-1.6.3: base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname". textconv: stop leaking file descriptors commit: --cleanup is a message option git count-objects: handle packs bigger than 4G t7102: make the test fail if one of its check fails Conflicts: builtin-commit.c | 19 January 2010, 05:37:06 UTC |
| 011c181 | Junio C Hamano | 19 January 2010, 05:29:47 UTC | Merge branch 'maint-1.6.2' into maint-1.6.3 * maint-1.6.2: base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname". textconv: stop leaking file descriptors commit: --cleanup is a message option git count-objects: handle packs bigger than 4G t7102: make the test fail if one of its check fails Conflicts: diff.c | 19 January 2010, 05:29:47 UTC |
| 18d97f5 | Junio C Hamano | 19 January 2010, 05:18:41 UTC | Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4 * commit 'v1.6.4.4-8-g8de6518': Fix mis-backport of t7002 | 19 January 2010, 05:18:41 UTC |
| 8de6518 | Junio C Hamano | 19 January 2010, 05:14:41 UTC | Fix mis-backport of t7002 The original patch that became cfe370c (grep: do not segfault when -f is used, 2009-10-16), was made against "maint" or newer branch back then, but the fix addressed the issue that was present as far as in 1.6.4 series. The maintainer backported the patch to the 1.6.4 maintenance branch, but failed to notice that the new tests assumed the setup done by the script in "maint", which did quite a lot more than the same test script in 1.6.4 series, and the output didn't match the expected result. This should fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 January 2010, 05:14:49 UTC |
| 6f9752d | Junio C Hamano | 19 January 2010, 02:16:15 UTC | Update draft release notes to 1.6.6.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 January 2010, 02:16:15 UTC |
| 6304c40 | Junio C Hamano | 19 January 2010, 02:15:12 UTC | Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint * dp/maint-1.6.5-fast-import-non-commit-tag: fast-import: tag may point to any object type | 19 January 2010, 02:15:12 UTC |
| 7d0dafe | Junio C Hamano | 19 January 2010, 01:03:34 UTC | Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint * jm/maint-1.6.5-grep-NUL-terminate: grep: NUL terminate input from a file | 19 January 2010, 01:03:34 UTC |
| 34f3999 | Jim Meyering | 18 January 2010, 21:55:07 UTC | grep: NUL terminate input from a file Internally "git grep" runs regexec(3) that expects its input string to be NUL terminated. When searching inside blob data, read_sha1_file() automatically gives such a buffer, but builtin-grep.c forgot to put the NUL at the end, even though it allocated enough space for it. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 January 2010, 01:01:29 UTC |
| b9cb077 | Richard Weinberger | 14 January 2010, 23:28:59 UTC | Fix uninitialized variable in get_refs_via_rsync(). This fixes a crash when cloning via rsync://. Signed-off-by: Richard Weinberger <richard@nod.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 January 2010, 05:20:28 UTC |
| 88d50e7 | Ramkumar Ramachandra | 08 January 2010, 18:48:07 UTC | Document git-blame triple -C option Lift the explanation of -CCC option in the source to the documentation. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 January 2010, 05:54:23 UTC |
| 8db751a | Dmitry Potapov | 14 January 2010, 04:44:19 UTC | fast-import: tag may point to any object type If you tried to export the official git repository, and then to import it back then git-fast-import would die complaining that "Mark :1 not a commit". Accordingly to a generated crash file, Mark 1 is not a commit but a blob, which is pointed by junio-gpg-pub tag. Because git-tag allows to create such tags, git-fast-import should import them. Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 January 2010, 05:51:06 UTC |
| 8efa5f6 | Shawn O. Pearce | 12 January 2010, 17:54:04 UTC | remote-curl: Fix Accept header for smart HTTP connections We actually expect to see an application/x-git-upload-pack-result but we lied and said we Accept *-response. This was a typo on my part when I was writing the code. Fortunately the wrong Accept header had no real impact, as the deployed git-http-backend servers were not testing the Accept header before they returned their content. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2010, 21:09:44 UTC |
| fbb9971 | Junio C Hamano | 12 January 2010, 08:22:23 UTC | grep: -L should show empty files The -L (--files-without-match) option is supposed to show paths that produced no matches. When running the internal grep on work tree files, however, we had an optimization to just return on zero-sized files, without doing anything. This optimization doesn't matter too much in practice (a tracked empty file must be rare, or there is something wrong with your project); to produce results consistent with GNU grep, we should stop the optimization and show empty files as not having the given pattern. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2010, 08:47:02 UTC |
| 2b77029 | Michael Haggerty | 11 January 2010, 15:56:45 UTC | rebase--interactive: Ignore comments and blank lines in peek_next_command Previously, blank lines and/or comments within a series of squash/fixup commands would confuse "git rebase -i" into thinking that the series was finished. It would therefore require the user to edit the commit message for the squash/fixup commits seen so far. Then, after continuing, it would ask the user to edit the commit message again. Ignore comments and blank lines within a group of squash/fixup commands, allowing them to be processed in one go. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2010, 04:31:48 UTC |
| eb80042 | Nguyễn Thái Ngọc Duy | 11 January 2010, 10:41:01 UTC | Add missing #include to support TIOCGWINSZ on Solaris On Linux TIOCGWINSZ is defined somehwere in ioctl.h, which is already included. On Solaris we also need to include termios.h. Without this term_columns() in help.c will think TIOCGWINSZ is not supported and always return 80 columns. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2010, 03:55:33 UTC |
| 8fb5d44 | Junio C Hamano | 10 January 2010, 08:51:54 UTC | Merge branch 'maint-1.6.2' into maint * maint-1.6.2: base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch Conflicts: diff.c | 10 January 2010, 08:51:54 UTC |
| c503467 | Junio C Hamano | 10 January 2010, 08:49:47 UTC | Merge branch 'maint-1.6.1' into maint-1.6.2 * maint-1.6.1: base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname". textconv: stop leaking file descriptors commit: --cleanup is a message option git count-objects: handle packs bigger than 4G t7102: make the test fail if one of its check fails Conflicts: diff.c | 10 January 2010, 08:49:47 UTC |
| 96aa7ad | Junio C Hamano | 10 January 2010, 08:48:47 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname". | 10 January 2010, 08:48:47 UTC |
| 0606c36 | Andreas Gruenbacher | 08 January 2010, 13:40:00 UTC | base85: Make the code more obvious instead of explaining the non-obvious Here is another cleanup ... Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2010, 06:43:47 UTC |
| b0bec51 | Andreas Gruenbacher | 08 January 2010, 16:22:18 UTC | base85: encode_85() does not use the decode table Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2010, 06:43:37 UTC |
| 75b7e16 | Andreas Gruenbacher | 08 January 2010, 13:39:58 UTC | base85 debug code: Fix length byte calculation Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2010, 06:43:27 UTC |
| 578b62b | Jonathan Nieder | 10 January 2010, 03:01:21 UTC | Documentation: tiny git config manual tweaks As a verb, 'setup' is spelled 'set up'. “diff commands such as diff-files” scans better without a comma. Clarify that shallow and deep are special non-boolean values for format.thread rather than boolean values with some other name. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2010, 06:41:08 UTC |
| efc266e | Jonathan Nieder | 10 January 2010, 02:59:41 UTC | Documentation: git gc packs refs by default now In commit 56752391 (Make "git gc" pack all refs by default, 2007-05-24), 'git gc' was changed to run pack-refs by default Versions before v1.5.1.2 cannot clone repos with packed refs over http, and versions before v1.4.4 cannot handled packed refs at all, but more recent git should have no problems. Try to make this more clear in the git-config manual. The analagous passage in git-gc.txt was updated already with commit fe2128a (Change git-gc documentation to reflect gc.packrefs implementation., 2008-01-09). Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2010, 06:40:52 UTC |
| 47b7012 | Björn Gustavsson | 07 December 2009, 18:35:42 UTC | git-rm doc: Describe how to sync index & work tree Newcomers to git that want to remove from the index only the files that have disappeared from the working tree will probably look for a way to do that in the documentation for 'git rm'. Therefore, describe how that can be done (even though it involves other commands than 'git rm'). Based on a suggestion by Junio, but re-arranged and rewritten to better fit into the style of command reference. While at it, change a single occurrence of "work tree" to "working tree" for consistency. Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2010, 23:37:33 UTC |
| 64da3ae | Junio C Hamano | 07 January 2010, 07:51:47 UTC | checkout -m: do not try to fall back to --merge from an unborn branch If switching from an unborn branch (= empty tree) to a valid commit failed without -m, it would fail with -m option as well. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2010, 07:51:47 UTC |
| b677c66 | Vitaly _Vi Shukela | 31 December 2009, 13:32:53 UTC | git-gui: Add hotkeys for "Unstage from commit" and "Revert changes" Signed-off-by: Vitaly _Vi Shukela <public_vi@tut.by> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 07 January 2010, 02:21:11 UTC |
| 54350a2 | Jonathan Nieder | 06 January 2010, 08:16:38 UTC | git-gui: Makefile: consolidate .FORCE-* targets Providing multiple targets to force a rebuild is unnecessary complication. Avoid using a name that could conflict with future special targets in GNU make (a leading period followed by uppercase letters). Cc: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 07 January 2010, 02:20:01 UTC |
| 6d6f9ac | Junio C Hamano | 06 January 2010, 20:32:02 UTC | checkout -m path: fix recreating conflicts We should tell ll_merge() that the 3-way merge between stages #2 and #3 is an outermost merge, not a virtual-ancestor creation. Back when this code was originally written, users couldn't write custom merge drivers easily, so the bug didn't matter, but these days it does. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2010, 21:49:41 UTC |
| dc89689 | Matthieu Moy | 02 January 2010, 16:35:32 UTC | stash: mention --patch in usage string. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2010, 18:40:55 UTC |
| 9bfff3a | Junio C Hamano | 31 December 2009, 23:00:14 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: branch: die explicitly why when calling "git branch [-a|-r] branchname". | 31 December 2009, 23:00:14 UTC |
| 6e8f993 | Matthieu Moy | 30 December 2009, 14:45:31 UTC | branch: die explicitly why when calling "git branch [-a|-r] branchname". The -a and -r options used to be silently ignored in such a command. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 December 2009, 22:52:05 UTC |
| 74fbd11 | Shawn O. Pearce | 30 December 2009, 15:03:48 UTC | fast-import: Document author/committer/tagger name is optional The fast-import parser does not validate that the author, committer or tagger name component contains both a name and an email address. Therefore the name component has always been optional. Correct the documentation to match the implementation. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 December 2009, 22:46:08 UTC |
| 63cb821 | Matthieu Moy | 30 December 2009, 14:51:22 UTC | SubmittingPatches: hints to know the status of a submitted patch. "What happened to my patch" is pretty much a FAQ on the Git mailing list, it deserves a few paragraphs in SubmittingPatches... Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 December 2009, 22:46:08 UTC |
| cf6e7ba | Thomas Rast | 31 December 2009, 11:48:41 UTC | bash completion: factor submodules into dirty state In the implementation of GIT_PS1_SHOWDIRTYSTATE in 738a94a (bash: offer to show (un)staged changes, 2009-02-03), I cut&pasted the git-diff invocations from dirty-worktree checks elsewhere, carrying along the --ignore-submodules option. As pointed out by Kevin Ballard, this doesn't really make sense: to the _user_, a changed submodule counts towards uncommitted changes. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 December 2009, 20:40:34 UTC |
| 4f2e842 | Björn Gustavsson | 31 December 2009, 09:43:17 UTC | Fix "git remote update" with remotes.defalt set Starting from commit 8db35596, "git remote update" (with no group name given) will fail with the following message if remotes.default has been set in the config file: fatal: 'default' does not appear to be a git repository fatal: The remote end hung up unexpectedly The problem is that the --multiple option is not passed to "git fetch" if no remote or group name is given on the command line. Fix the problem by always passing the --multiple option to "git fetch" (which actually simplifies the code). Reported-by: YONETANI Tomokazu Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 December 2009, 20:23:41 UTC |
| b0b3a24 | Junio C Hamano | 30 December 2009, 09:24:12 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: textconv: stop leaking file descriptors commit: --cleanup is a message option git count-objects: handle packs bigger than 4G t7102: make the test fail if one of its check fails Conflicts: builtin-commit.c diff.c | 30 December 2009, 09:24:12 UTC |
