| e923eae | Junio C Hamano | 12 February 2010, 23:45:05 UTC | Git 1.7.0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2010, 23:45:05 UTC |
| ca5812d | Junio C Hamano | 12 February 2010, 23:40:59 UTC | Merge branch 'maint' * maint: Fix typo in 1.6.6.2 release notes Re-fix check-ref-format documentation mark-up | 12 February 2010, 23:40:59 UTC |
| 341d9a4 | Junio C Hamano | 12 February 2010, 23:40:01 UTC | Fix typo in 1.6.6.2 release notes Of course, these are changes since 1.6.6.1; changes since 1.6.6.2 would have been nil. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2010, 23:40:01 UTC |
| 8222153 | Junio C Hamano | 12 February 2010, 23:39:03 UTC | Re-fix check-ref-format documentation mark-up It is not double-backslash we forbid; backslashes are forbidden since a4c2e699 (Disallow '\' in ref names, 2009-05-08) Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2010, 23:39:03 UTC |
| 9b4c8b0 | Junio C Hamano | 10 February 2010, 20:33:58 UTC | archive documentation: attributes are taken from the tree by default By default, git-archive takes attributes from the tree being archived. People however often wonder why their attempts to affect the way how the command archives their tree by changing .gitattributes in their work tree fail. Add a bit of explanatory note to tell them how to achieve what they want to do. Noticed-by: Francois Marier Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2010, 17:38:20 UTC |
| f937421 | Michael J Gruber | 12 February 2010, 09:47:53 UTC | Documentation: minor fixes to RelNotes-1.7.0 Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2010, 17:38:02 UTC |
| 85f6b43 | SZEDER Gábor | 12 February 2010, 14:11:47 UTC | bash: support 'git am's new '--continue' option Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2010, 17:08:17 UTC |
| 618d18b | Junio C Hamano | 12 February 2010, 07:06:32 UTC | Merge branch 'maint' * maint: filter-branch: Fix error message for --prune-empty --commit-filter | 12 February 2010, 07:06:32 UTC |
| 5da8171 | Jacob Helwig | 12 February 2010, 02:46:22 UTC | filter-branch: Fix error message for --prune-empty --commit-filter Running filter-branch with --prune-empty and --commit-filter reports: "Cannot set --prune-empty and --filter-commit at the same time". Change it to use the correct option name: --commit-filter Signed-off-by: Jacob Helwig <jacob.helwig@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2010, 06:12:36 UTC |
| c8089af | Jeff King | 11 February 2010, 22:27:14 UTC | am: switch --resolved to --continue Rebase calls this same function "--continue", which means users may be trained to type it. There is no reason to deprecate --resolved (or -r), so we will keep it as a synonym. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2010, 06:10:00 UTC |
| f476c0b | Junio C Hamano | 10 February 2010, 21:47:46 UTC | Update draft release notes to 1.7.0 one more time Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2010, 21:47:46 UTC |
| d1672d9 | Junio C Hamano | 10 February 2010, 21:46:15 UTC | Sync with 1.6.6.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2010, 21:46:15 UTC |
| 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 |
| 3c65149 | Thomas Rast | 10 February 2010, 16:30:29 UTC | Documentation: quote braces in {upstream} notation The lack of quoting made the entire line disappear. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2010, 18:01:43 UTC |
| 8b2337a | Brian Gernhardt | 09 February 2010, 04:07:25 UTC | t3902: Protect against OS X normalization 8424981: "Fix invalid read in quote_c_style_counted" introduced a test that used "caractère spécial" as a directory name. Git creates it as "caract\303\250re sp\303\251cial" OS X stores it as "caracte\314\200re spe\314\201cial" To work around this problem, use the already introduced $FN as the directory name. Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 February 2010, 07:06:08 UTC |
| 105a633 | Junio C Hamano | 09 February 2010, 05:54:10 UTC | Merge branch 'maint' * maint: blame: prevent a segv when -L given start > EOF git-push: document all the status flags used in the output Fix parsing of imap.preformattedHTML and imap.sslverify git-add documentation: Fix shell quoting example | 09 February 2010, 05:54:10 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 |
| 720c9f7 | Nicolas Pitre | 08 February 2010, 15:39:01 UTC | Revert "pack-objects: fix pack generation when using pack_size_limit" This reverts most of commit a2430dde8ceaaaabf05937438249397b883ca77a. That commit made the situation better for repositories with relatively small number of objects. However with many objects and a small pack size limit, the time required to complete the repack tends towards O(n^2), or even much worse with long delta chains. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 February 2010, 18:56:21 UTC |
| 8051a03 | Junio C Hamano | 07 February 2010, 23:52:28 UTC | Merge git://repo.or.cz/git-gui * git://repo.or.cz/git-gui: git-gui: update french translation git-gui: update Japanese translation git-gui: fix shortcut for menu "Commit/Revert Changes" git-gui: Quote git path when starting another gui in a submodule git-gui: update Italian translation git-gui: Update Swedish translation (520t0f0u) git-gui: use themed tk widgets with Tk 8.5 git-gui: Update German translation (12 new or changed strings). git-gui: Update translation template git-gui: Remove unused icon file_parttick git-gui: use different icon for new and modified files in the index git-gui: set GIT_DIR and GIT_WORK_TREE after setup git-gui: update shortcut tools to use _gitworktree git-gui: handle bare repos correctly git-gui: handle non-standard worktree locations git-gui: Support applying a range of changes at once git-gui: Add a special diff popup menu for submodules git-gui: Use git diff --submodule when available | 07 February 2010, 23:52:28 UTC |
| e7ec9de | Junio C Hamano | 07 February 2010, 23:52:12 UTC | Merge branch 'maint' * maint: archive: simplify archive format guessing | 07 February 2010, 23:52:12 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 |
| 8424981 | Jeff King | 01 February 2010, 13:39:03 UTC | Fix invalid read in quote_c_style_counted This function did not work on strings that were not NUL-terminated. It reads through a length-bounded string, searching for characters in need of quoting. After we find one, we output the quoted character, then advance our pointer to find the next one. However, we never decremented the length, meaning we ended up looking at whatever random junk was stored after the string. This bug was not found by the existing tests because most code paths feed a NUL-terminated string. The notable exception is a directory name being fed by ls-tree. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2010, 18:55:03 UTC |
| d2d66f1 | Jeff King | 01 February 2010, 12:43:45 UTC | docs: fix filter-branch example for quoted paths If there is a quoted path, update-index will correctly unquote it. However, we must take care to put our new prefix inside the double-quote. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2010, 18:52:14 UTC |
| ab35469 | Brian Gernhardt | 06 February 2010, 14:50:03 UTC | t9501: Re-fix max load test Revert the previous attempt to skip this test on platforms where we currently cannot determine the system load. We want to make sure that the max-load-limit codepath produces results cleanly, when gitweb is updated and becomes capable of reading the load average by some other method. The code to check for load returns 0 if it doesn't know how to find load. It also checks to see if the current load is higher than the max load. So to force the script to quit early by setting the maxload variable negative which should work for systems where we can detect load (which should be a positive number) and systems where we can't (where detected load is 0) Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2010, 18:33:07 UTC |
| 6d0d465 | Björn Gustavsson | 06 February 2010, 08:37:53 UTC | bash: support the --autosquash option for rebase Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2010, 17:51:43 UTC |
| 04bf448 | Junio C Hamano | 06 February 2010, 05:22:59 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix copyright symbol in About box message | 06 February 2010, 05:22:59 UTC |
| 6448e0c | Brian Gernhardt | 06 February 2010, 05:00:40 UTC | t9501: Skip testing load if we can't detect it Currently gitweb only knows how to check for load using /proc/loadavg, which isn't available on all systems. We shouldn't fail the test just because we don't know how to check the system load. Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2010, 05:12:06 UTC |
| 71f1a21 | Junio C Hamano | 06 February 2010, 00:36:56 UTC | Update draft release notes to 1.7.0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2010, 00:36:56 UTC |
| 3bd8de5 | Junio C Hamano | 06 February 2010, 00:34:00 UTC | Merge branch 'maint' * maint: Update git fsck --full short description to mention packs | 06 February 2010, 00:34:00 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 |
| 3c8f6c8 | Junio C Hamano | 05 February 2010, 17:20:01 UTC | Revert 30816237 and 7e62265 It seems that we have bad interaction with the code related to GIT_WORK_TREE and "grep --no-index", and broke running grep inside the .git directory. For now, just revert it and resurrect it after 1.7.0 ships. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2010, 17:27:25 UTC |
| 8bff7c5 | Andrew Myrick | 30 January 2010, 03:14:22 UTC | git-svn: persistent memoization Make memoization of the svn:mergeinfo processing functions persistent with Memoize::Storable so that the memoization tables don't need to be regenerated every time the user runs git-svn fetch. The Memoize::Storable hashes are stored in ENV{GIT_DIR}/svn/.caches. [ew: changed caches path to avoid conflicts with old repos] [ew: File::Path::{make_path => mkpath} for compatibility] [ew: line-wrapped at 80 chars] Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Andrew Myrick <amyrick@apple.com> | 05 February 2010, 07:33:25 UTC |
| 4d0cc22 | Junio C Hamano | 04 February 2010, 19:10:44 UTC | fast-import: count --max-pack-size in bytes Similar in spirit to 07cf0f2 (make --max-pack-size argument to 'git pack-object' count in bytes, 2010-02-03) which made the option by the same name to pack-objects, this counts the pack size limit in bytes. In order not to cause havoc with people used to the previous megabyte scale an integer smaller than 8192 is interpreted in megabytes but the user gets a warning. Also a minimum size of 1 MiB is enforced to avoid an explosion of pack files. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Acked-by: Nicolas Pitre <nico@fluxnic.net> | 04 February 2010, 23:12:17 UTC |
| 9f17688 | Nicolas Pitre | 04 February 2010, 21:19:35 UTC | update git-repack documentation wrt repack.UseDeltaBaseOffset This default for repack.UseDeltaBaseOffset has been "true" since Git v1.6.0. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2010, 23:12:16 UTC |
| 89c3850 | Michael J Gruber | 04 February 2010, 16:01:16 UTC | git-clean: fix the description of the default behavior Currently, when called without -n and -f, git clean issues fatal: clean.requireForce not set and -n or -f not given; refusing to clean which leaves the user wondering why force is required when requireForce is not set. Looking up in git-clean(1) does not help because its description is wrong. Change it so that git clean issues fatal: clean.requireForce defaults to true and -n or -f not given; refusing to clean in this situation (and "...set to true..." when it is set) which makes it clearer that an unset config means true here, and adjust the documentation. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2010, 23:12:13 UTC |
| 76ea93c | Junio C Hamano | 04 February 2010, 02:27:08 UTC | fast-import.c: Fix big-file-threshold parsing bug Manual merge made at 844ad3d (Merge branch 'sp/maint-fast-import-large-blob' into sp/fast-import-large-blob, 2010-02-01) did not correctly reflect the change of unit in which this variable's value is counted from its previous version. Now it counts in bytes, not in megabytes. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> | 04 February 2010, 17:09:50 UTC |
| 07cf0f2 | Nicolas Pitre | 04 February 2010, 03:48:28 UTC | make --max-pack-size argument to 'git pack-object' count in bytes The value passed to --max-pack-size used to count in MiB which was inconsistent with the corresponding configuration variable as well as other command arguments which are defined to count in bytes with an optional unit suffix. This brings --max-pack-size in line with the rest of Git. Also, in order not to cause havoc with people used to the previous megabyte scale, and because this is a sane thing to do anyway, a minimum size of 1 MiB is enforced to avoid an explosion of pack files. Adjust and extend test suite accordingly. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2010, 04:39:56 UTC |
| a2430dd | Nicolas Pitre | 04 February 2010, 03:48:27 UTC | pack-objects: fix pack generation when using pack_size_limit Current handling of pack_size_limit is quite suboptimal. Let's consider a list of objects to pack which contain alternatively big and small objects (which pretty matches reality when big blobs are interlaced with tree objects). Currently, the code simply close the pack and opens a new one when the next object in line breaks the size limit. The current code may degenerate into: - small tree object => store into pack #1 - big blob object busting the pack size limit => store into pack #2 - small blob but pack #2 is over the limit already => pack #3 - big blob busting the size limit => pack #4 - small tree but pack #4 is over the limit => pack #5 - big blob => pack #6 - small tree => pack #7 - ... and so on. The reality is that the content of packs 1, 3, 5 and 7 could well be stored more efficiently (and delta compressed) together in pack #1 if the big blobs were not forcing an immediate transition to a new pack. Incidentally this can be fixed pretty easily by simply skipping over those objects that are too big to fit in the current pack while trying the whole list of unwritten objects, and then that list considered from the beginning again when a new pack is opened. This creates much fewer smallish pack files and help making more predictable test cases for the test suite. This change made one of the self sanity checks useless so it is removed as well. That check was rather redundant already anyway. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2010, 04:39:24 UTC |
| 2fca19f | Nicolas Pitre | 04 February 2010, 03:48:26 UTC | fix multiple issues with t5300 First of all, trying to run 'git verify-pack' on packs produced by the tests using pack.packSizeLimit always failed. After lots of digging and head scratching, it turns out that the preceeding test simulating a SHA1 collision did leave the repository quite confused, impacting subsequent tests. So let's move that destructive test last, and add tests to run verify-pack on the output from those packSizeLimit tests to catch such goofage. Finally, group those packSizeLimit tests together. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2010, 04:38:47 UTC |
| 57017b3 | John 'Warthog9' Hawley | 03 February 2010, 11:28:28 UTC | gitweb: Simplify (and fix) chop_str The chop_str subroutine is meant to be used on strings (such as commit description / title) *before* HTML escaping, which means before applying esc_html or equivalent. Therefore get rid of the failed attempt to always remove full HTML entities (like e.g. & or ). It is not necessary (HTML entities gets added later), and it can cause chop_str to chop a string incorrectly. Specifically: API & protocol: support option to force written data immediately to disk from http://git.kernel.org/?p=daemon/distsrv/chunkd.git;a=commit;h=3b02f749df2cb1288f345a689d85e7061f507e54 The short version of the title gets chopped to API ... where it should be API & protocol: support option to force written data... Noticed-by: John 'Warthog9' Hawley <warthog9@kernel.org> Signed-off-by: John 'Warthog9' Hawley <warthog9@kernel.org> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2010, 01:14:00 UTC |
| 7963791 | Paul Mackerras | 03 February 2010, 21:49:00 UTC | gitk: Fix copyright symbol in About box message Somehow it got corrupted in commit d93f1713 ("gitk: Use themed tk widgets"). Signed-off-by: Paul Mackerras <paulus@samba.org> | 03 February 2010, 21:49:00 UTC |
| 7928610 | René Scharfe | 03 February 2010, 18:16:30 UTC | grep: simplify assignment of ->fixed After 885d211e, the value of the ->fixed pattern option only depends on the grep option of the same name. Regex flags don't matter any more, because fixed mode and regex mode are strictly separated. Thus we can simply copy the value from struct grep_opt to struct grep_pat, as we do already for ->word_regexp and ->ignore_case. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 February 2010, 20:03:40 UTC |
| 4b7acc1 | Junio C Hamano | 03 February 2010, 05:48:34 UTC | Merge branch 'ms/filter-branch-submodule' * ms/filter-branch-submodule: filter-branch: Add tests for submodules in tree-filter filter-branch: Fix to allow replacing submodules with another content | 03 February 2010, 05:48:34 UTC |
| 484e669 | Junio C Hamano | 03 February 2010, 05:48:22 UTC | Merge branch 'jh/gitweb-caching' (early part) * 'jh/gitweb-caching' (early part): gitweb: Add optional extra parameter to die_error, for extended explanation gitweb: add a "string" variant of print_sort_th gitweb: add a "string" variant of print_local_time gitweb: Check that $site_header etc. are defined before using them gitweb: Makefile improvements gitweb: Load checking gitweb: Make running t9501 test with '--debug' reliable and usable | 03 February 2010, 05:48:22 UTC |
| 347d04d | Junio C Hamano | 03 February 2010, 05:48:13 UTC | Merge branch 'bw/no-python-autoconf' * bw/no-python-autoconf: configure: Allow --without-python configure: Allow GIT_ARG_SET_PATH to handle --without-PROGRAM | 03 February 2010, 05:48:13 UTC |
| d3b91fa | Junio C Hamano | 03 February 2010, 05:47:51 UTC | Merge branch 'sp/fast-import-large-blob' * sp/fast-import-large-blob: fast-import: Stream very large blobs directly to pack | 03 February 2010, 05:47:51 UTC |
| b659b49 | Shawn O. Pearce | 02 February 2010, 15:33:28 UTC | Correct spelling of 'REUC' extension The new dircache extension CACHE_EXT_RESOLVE_UNDO, whose value is 0x52455543, is actually the ASCII sequence 'REUC', not the ASCII sequence 'REUN'. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 February 2010, 17:54:34 UTC |
| 89d6159 | Emmanuel Trillaud | 02 February 2010, 11:59:34 UTC | git-gui: update french translation Signed-off-by: Emmanuel Trillaud <etrillaud@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 February 2010, 15:34:04 UTC |
| 5bf4684 | Nanako Shiraishi | 02 February 2010, 10:20:21 UTC | git-gui: update Japanese translation Update ja.po to match 2010-01-26 version of pot file. Signed-off-by: しらいし ななこ <nanako3@lavabit.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 February 2010, 14:59:06 UTC |
| b8bba41 | Junio C Hamano | 02 February 2010, 06:04:03 UTC | build: make code "-Wpointer-arith" clean Recently introduced resolve_undo_read() expected arithmetic to (void *) to work on byte-addresses. Correct this. Noticed by Brandon Casey. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 February 2010, 06:04:03 UTC |
| dc78250 | Ben Walton | 01 February 2010, 02:15:05 UTC | configure: Allow --without-python This patch allows someone to use configure to build git while at the same time disabling the python remote helper code. It leverages the ability of GIT_ARG_SET_PATH to accept an optional second argument indicating that --without-$PROGRAM is acceptable. Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 February 2010, 21:03:55 UTC |
| f22cd7f | Ben Walton | 01 February 2010, 02:15:04 UTC | configure: Allow GIT_ARG_SET_PATH to handle --without-PROGRAM Add an optional second argument to both GIT_ARG_SET_PATH and GIT_CONF_APPEND_PATH such that any value of the second argument will enable configure to set NO_$PROGRAM in addition to an empty $PROGRAM_PATH. This is initially useful for allowing configure to disable the use of python, as the remote helper code has nothing leveraging it yet. The Makefile already recognizes NO_PYTHON, but configure provided no way to set it appropriately. Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 February 2010, 21:03:54 UTC |
| 844ad3d | Junio C Hamano | 01 February 2010, 20:41:31 UTC | Merge branch 'sp/maint-fast-import-large-blob' into sp/fast-import-large-blob * sp/maint-fast-import-large-blob: fast-import: Stream very large blobs directly to pack bash: don't offer remote transport helpers as subcommands Conflicts: fast-import.c | 01 February 2010, 20:42:00 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 |
| 562d53f | Pal-Kristian Engstad | 22 January 2010, 02:33:00 UTC | git-p4: Fix sync errors due to new server version Fix sync errors due to new Perforce servers. The P4D/NTX64/2009.2/228098 (2009/12/16) server reports 'move/delete' instead of 'delete'. This causes the Perforce depot and the git repo to get out of sync. Fixed by adding the new status string. Signed-off-by: Pal-Kristian Engstad <pal_engstad@naughtydog.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 February 2010, 20:08:14 UTC |
| 8d9e7d5 | Jens Lehmann | 01 February 2010, 18:09:39 UTC | Updates for dirty submodules in release notes and user manual In the release notes "git status" was not mentioned, also shortly explain the "-dirty" output generated by diff. Added a paragraph to the "Pitfalls with submodules" section in user-manual.txt describing new and old behavior of "git status" and "git diff" for dirty submodules. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 February 2010, 20:08:12 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 |
| c0da5db | Junio C Hamano | 31 January 2010, 20:20:30 UTC | Update draft release notes to 1.7.0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2010, 20:20:30 UTC |
| 2ee8c5b | Junio C Hamano | 31 January 2010, 20:09:35 UTC | Merge branch 'dm/make-threaded-simplify' * dm/make-threaded-simplify: Make NO_PTHREADS the sole thread configuration variable | 31 January 2010, 20:09:35 UTC |
| 7eb151d | Dan McGee | 30 January 2010, 01:22:19 UTC | Make NO_PTHREADS the sole thread configuration variable When the first piece of threaded code was introduced in commit 8ecce684, it came with its own THREADED_DELTA_SEARCH Makefile option. Since this time, more threaded code has come into the codebase and a NO_PTHREADS option has also been added. Get rid of the original option as the newer, more generic option covers everything we need. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2010, 19:50:50 UTC |
| 9f7a3c1 | Junio C Hamano | 31 January 2010, 19:11:16 UTC | RPM packaging: use %global inside %{!?...} According to https://www.redhat.com/archives/fedora-devel-list/2010-January/msg00093.html scope of %define lasts until the end brace; earlier RPM up to Fedora 12 didn't necessarily honor the scope, but later versions corrected the bug. Problem and solution both pointed out by Todd Zullinger. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2010, 19:33:44 UTC |
| 6ddf75a | Jeff King | 31 January 2010, 09:14:46 UTC | mention new shell execution behavior in release notes This is already in the "bells and whistles" section, but it also has a slight chance of breakage, so let's also mention it in the "changed behaviors" section. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2010, 18:27:56 UTC |
| de7a796 | Jens Lehmann | 31 January 2010, 16:43:49 UTC | Fix memory leak in submodule.c The strbuf used in add_submodule_odb() was never released. So for every submodule - populated or not - we leaked its object directory name when using "git diff*" with the --submodule option. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2010, 18:25:23 UTC |
| 6a5d0b0 | Ralf Wildenhues | 31 January 2010, 13:24:39 UTC | Fix typos in technical documentation. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2010, 18:24:53 UTC |
| aa14013 | John 'Warthog9' Hawley | 30 January 2010, 22:30:44 UTC | gitweb: Add optional extra parameter to die_error, for extended explanation Add a 3rd, optional, parameter to die_error to allow for extended error information to be output along with what the error was. Signed-off-by: John 'Warthog9' Hawley <warthog9@kernel.org> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2010, 23:53:55 UTC |
| 1ee4b4e | John 'Warthog9' Hawley | 30 January 2010, 22:30:43 UTC | gitweb: add a "string" variant of print_sort_th Add a function (named format_sort_th) that returns the string that print_sort_th would print. Signed-off-by: John 'Warthog9' Hawley <warthog9@kernel.org> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2010, 23:53:54 UTC |
| 0cf207f | John 'Warthog9' Hawley | 30 January 2010, 22:30:42 UTC | gitweb: add a "string" variant of print_local_time Add a function (named format_local_time) that returns the string that print_local_time would print. Signed-off-by: John 'Warthog9' Hawley <warthog9@kernel.org> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2010, 23:53:54 UTC |
| 24d4afc | John 'Warthog9' Hawley | 30 January 2010, 22:30:41 UTC | gitweb: Check that $site_header etc. are defined before using them If one of $site_header, $site_footer or $home_text is not defined, you get extraneous errors in the web logs, for example (line wrapped for better readibility): [Wed Jan 13 16:55:42 2010] [error] [client ::1] [Wed Jan 13 16:55:42 2010] gitweb.cgi: Use of uninitialized value $site_header in -f at /var/www/gitweb/gitweb.cgi line 3287., referer: http://git/gitweb.cgi This ensures that those variables are defined before trying to use it. Note that such error can happen only because of an error in gitweb config file; building gitweb.cgi can make mentioned variables holding empty string (it is even the default), but they are still defined. Signed-off-by: John 'Warthog9' Hawley <warthog9@kernel.org> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2010, 23:53:53 UTC |
| 62331ef | John 'Warthog9' Hawley | 30 January 2010, 22:30:40 UTC | gitweb: Makefile improvements Adjust the main Makefile so you can simply run make gitweb which in turn calls gitweb/Makefile. This means that in order to generate gitweb, you can simply run 'make' from gitweb subdirectory: cd gitweb make Targets gitweb/gitweb.cgi and (dependent on JSMIN being defined) gitweb/gitweb.min.js in main Makefile are preserved for backward compatibility. Signed-off-by: John 'Warthog9' Hawley <warthog9@kernel.org> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2010, 23:53:52 UTC |
| b62a1a9 | John 'Warthog9' Hawley | 30 January 2010, 22:30:39 UTC | gitweb: Load checking This changes slightly the behavior of gitweb, so that it verifies that the box isn't inundated with before attempting to serve gitweb. If the box is overloaded, it basically returns a 503 Server Unavailable until the load falls below the defined threshold. This helps dramatically if you have a box that's I/O bound, reaches a certain load and you don't want gitweb, the I/O hog that it is, increasing the pain the server is already undergoing. This behavior is controlled by $maxload configuration variable. Default is a load of 300, which for most cases should never be hit. Unset it (set it to undefined value, i.e. undef) to turn off checking. Currently it requires that '/proc/loadavg' file exists, otherwise the load check is bypassed (load is taken to be 0). So platforms that do not implement '/proc/loadavg' currently cannot use this feature (provisions are included for additional checks to be added by others). There is simple test in t/t9501-gitweb-standalone-http-status.sh to check that it correctly returns "503 Service Unavailable" if load is too high, and also if there are any Perl warnings or errors. Signed-off-by: John 'Warthog9' Hawley <warthog9@kernel.org> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2010, 23:53:50 UTC |
| 745a2db | Jakub Narebski | 30 January 2010, 22:30:38 UTC | gitweb: Make running t9501 test with '--debug' reliable and usable Remove test_debug lines after 'snapshots: tgz only default format enabled' and 'snapshots: all enabled in default, use default disabled value' tests. Those tests constitute of multiple gitweb_run invocation, therefore outputting gitweb.output for the last gitweb_run wouldn't help much in debugging test failure, and can only confuse. For snapshot tests which check for "200 OK" status, change test_debug 'cat gitweb.output' to test_debug 'cat gitweb.headers' Otherwise when running this test with '--debug' option, t/t9501-gitweb-standalone-http-status.sh would dump *binary data* (the snapshot itself) to standard output, which can mess up state of terminal due to term control characters which can be embedded in output. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2010, 23:33:06 UTC |
| b0883aa | Junio C Hamano | 30 January 2010, 20:08:26 UTC | is_submodule_modified(): fix breakage with external GIT_INDEX_FILE Even when the environment was given for the top-level process, checking in the submodule work tree should use the index file associated with the work tree of the submodule. Do not export it to the environment. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2010, 21:56:56 UTC |
| a9c7c43 | Junio C Hamano | 30 January 2010, 17:45:11 UTC | RPM packaging: don't include foreign-scm-helper bits yet The files in /usr/lib/python* are only the support infrastructure for foreign scm interface yet to be written and/or shipped with git. Don't include them in the binary package (this will also free us from Python dependency). When we ship with foreign scm interface, we will need to package these files with it in a separate subpackage, but we are not there yet. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2010, 21:56:50 UTC |
| bfac23d | Dan McGee | 30 January 2010, 15:42:58 UTC | grep: Fix two memory leaks We duplicate the grep_opt structure when using grep threads, but didn't later free either the patterns attached to this new structure or the structure itself. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2010, 17:11:00 UTC |
| 31d8738 | Markus Heidelberg | 30 January 2010, 16:23:37 UTC | rebase: don't invoke the pager for each commit summary This regression was introduced by commit 0aa958d (rebase: replace antiquated sed invocation, 2010-01-24), which changed the invocation of "git rev-list | sed" to "git log". It can be reproduced by something like this: $ git rebase -s recursive origin/master Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2010, 16:42:42 UTC |
| 3a985c2 | Junio C Hamano | 30 January 2010, 07:38:31 UTC | Update draft release notes to 1.7.0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2010, 07:38:31 UTC |
| b10b918 | Junio C Hamano | 30 January 2010, 07:36:17 UTC | Merge branch 'maint' * maint: fix memcpy of overlapping area | 30 January 2010, 07:36:17 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 |
| 947c346 | Johannes Sixt | 29 January 2010, 23:54:05 UTC | Implement pthread_cond_broadcast on Windows See http://www.cse.wustl.edu/~schmidt/win32-cv-1.html, section "The SignalObjectAndWait solution". But note that this implementation does not use SignalObjectAndWait (which is needed to achieve fairness, but we do not need fairness). Note that our implementations of pthread_cond_broadcast and pthread_cond_signal require that they are invoked with the mutex held that is used in the pthread_cond_wait calls. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2010, 03:42:40 UTC |
| a004fb9 | Sebastian Schuberth | 23 January 2010, 14:20:28 UTC | If deriving SVN_SSH from GIT_SSH on msys, also add quotes In contrast to GIT_SSH, SVN_SSH requires quotes for paths that contain spaces. As GIT_SSH will not work if it contains quotes, it is safe to assume it never contains quotes. Also, adding quotes to SVN_SSH for paths that do not contain spaces does no harm. So we always add quotes when deriving SVN_SSH from GIT_SSH on msys. This fixes msysGit issue 385, see http://code.google.com/p/msysgit/issues/detail?id=385 Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2010, 03:37:54 UTC |
