| 78bc466 | Junio C Hamano | 26 March 2011, 00:56:14 UTC | Git 1.7.4.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 March 2011, 00:56:14 UTC |
| 2b1e172 | Jakub Narebski | 25 March 2011, 19:20:49 UTC | gitweb: Fix handling of fractional timezones in parse_date Fractional timezones, like -0330 (NST used in Canada) or +0430 (Afghanistan, Iran DST), were not handled properly in parse_date; this means values such as 'minute_local' and 'iso-tz' were not generated correctly. This was caused by two mistakes: * sign of timezone was applied only to hour part of offset, and not as it should be also to minutes part (this affected only negative fractional timezones). * 'int $h + $m/60' is 'int($h + $m/60)' and not 'int($h) + $m/60', so fractional part was discarded altogether ($h is hours, $m is minutes, which is always less than 60). Note that positive fractional timezones +0430, +0530 and +1030 can be found as authortime in git.git repository itself. For example http://repo.or.cz/w/git.git/commit/88d50e7 had authortime of "Fri, 8 Jan 2010 18:48:07 +0000 (23:48 +0530)", which is not marked with 'atnight', when "git show 88d50e7" gives correct author date of "Sat Jan 9 00:18:07 2010 +0530". Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 March 2011, 20:27:05 UTC |
| b5f306f | SZEDER Gábor | 22 March 2011, 18:42:25 UTC | git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply' 'git am --abort' is around for quite a long time now, and users should normally not poke around inside the .git directory, yet the documentation of 'git am' still recommends the following: ... if you decide to start over from scratch, run `rm -f -r .git/rebase-apply` ... Suggest 'git am --abort' instead. It's not quite the same as the original, because 'git am --abort' will restore the original branch, while simply removing '.git/rebase-apply' won't, but that's rather a thinko in the original wording, because that won't actually "start over _from scratch_". Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 March 2011, 21:31:21 UTC |
| c4e4644 | Jeff King | 21 March 2011, 13:14:22 UTC | bisect: visualize with git-log if gitk is unavailable If gitk is not available in the PATH, bisect ends up exiting with the shell's 127 error code, confusing the git wrapper into thinking that bisect is not a git command. We already fallback to git-log if there doesn't seem to be a graphical display available. We should do the same if gitk is not available in our PATH at all. This not only fixes the ugly error message, but is a much more sensible default than failing to show the user anything. Reported by Maxin John. Tested-by: Maxin B. John <maxin@maxinbjohn.info> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2011, 17:23:45 UTC |
| d98f24c | Junio C Hamano | 21 March 2011, 05:14:21 UTC | Update draft release notes to 1.7.4.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2011, 05:14:21 UTC |
| 0bd20f1 | Junio C Hamano | 21 March 2011, 05:11:46 UTC | Merge branch 'sp/maint-fd-limit' into maint * sp/maint-fd-limit: sha1_file.c: Don't retain open fds on small packs mingw: add minimum getrlimit() compatibility stub Limit file descriptors used by packs | 21 March 2011, 05:11:46 UTC |
| dd7d0d0 | Junio C Hamano | 21 March 2011, 05:11:15 UTC | Merge branch 'mr/hpux' into maint * mr/hpux: git-compat-util.h: Honor HP C's noreturn attribute Makefile: add NO_FNMATCH_CASEFOLD to HP-UX section | 21 March 2011, 05:11:15 UTC |
| 106040f | Junio C Hamano | 21 March 2011, 05:11:02 UTC | Merge branch 'so/submodule-no-update-first-time' into maint * so/submodule-no-update-first-time: t7406: "git submodule update {--merge|--rebase]" with new submodules submodule: no [--merge|--rebase] when newly cloned | 21 March 2011, 05:11:02 UTC |
| eec8a51 | Junio C Hamano | 21 March 2011, 05:10:31 UTC | Merge branch 'mo/perl-bidi-pipe-envfix' into maint * mo/perl-bidi-pipe-envfix: perl: command_bidi_pipe() method should set-up git environmens | 21 March 2011, 05:10:31 UTC |
| a8e04dd | Junio C Hamano | 21 March 2011, 05:09:39 UTC | Merge branch 'ae/better-template-failure-report' into maint * ae/better-template-failure-report: Improve error messages when temporary file creation fails | 21 March 2011, 05:09:39 UTC |
| c3786c8 | Ben Walton | 21 March 2011, 01:12:26 UTC | Work around broken ln on solaris as used in t8006 The test setup in t8006-blame-textconv.sh uses "ln -sf" to overwrite an existing symlink. Unfortunately, both /usr/bin/ln and /usr/xpg4/bin/ln on solaris 9 don't properly handle -f and -s used at the same time. This caused the test setup and subsequent checks to fail. Instead, remove the symlink and then create a new one in the setup code. The upstream Solaris bug (fixed in 10, but not 9) is documented here: http://bugs.opensolaris.org/view_bug.do?bug_id=4372462 Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2011, 04:58:09 UTC |
| 9aec68d | Carlos Martín Nieto | 15 March 2011, 09:32:11 UTC | t/README: Add a note about running commands under valgrind The test suite runs valgrind with certain options activated. Add a note saying how to run commands under the same conditions as the test suite does. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2011, 04:19:38 UTC |
| 6368d9f | Jakub Narebski | 19 March 2011, 22:53:55 UTC | gitweb: Always call parse_date with timezone parameter Timezone is required to correctly set local time, which would be needed for future 'localtime' feature. While at it, remove unnecessary call to the function from git_log_body, as its return value is not used anywhere. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 March 2011, 04:46:32 UTC |
| 958bf6b | Junio C Hamano | 20 March 2011, 04:46:06 UTC | bisect: explain the rationale behind 125 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 March 2011, 04:46:24 UTC |
| b547ce0 | Alexei Sholik | 18 March 2011, 13:14:27 UTC | docs: fix grammar in gitattributes.txt [jc: with a fixlet from Marc Branchaud] Signed-off-by: Alexei Sholik <alcosholik@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 March 2011, 16:58:47 UTC |
| fbcda3c | Junio C Hamano | 16 March 2011, 23:29:03 UTC | Prepare draft release notes to 1.7.4.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 23:47:40 UTC |
| afb497d | Junio C Hamano | 16 March 2011, 23:47:26 UTC | Merge branch 'jn/maint-commit-missing-template' into maint * jn/maint-commit-missing-template: commit: error out for missing commit message template | 16 March 2011, 23:47:26 UTC |
| 43c1b6e | Junio C Hamano | 16 March 2011, 23:47:26 UTC | Merge branch 'lt/rename-no-extra-copy-detection' into maint * lt/rename-no-extra-copy-detection: diffcore-rename: improve estimate_similarity() heuristics diffcore-rename: properly honor the difference between -M and -C for_each_hash: allow passing a 'void *data' pointer to callback | 16 March 2011, 23:47:26 UTC |
| 4e530c5 | Junio C Hamano | 16 March 2011, 23:47:26 UTC | Merge branch 'jk/diffstat-binary' into maint * jk/diffstat-binary: diff: don't retrieve binary blobs for diffstat diff: handle diffstat of rewritten binary files | 16 March 2011, 23:47:26 UTC |
| 13a39e2 | Junio C Hamano | 16 March 2011, 23:47:26 UTC | Merge branch 'mg/maint-difftool-vim-readonly' into maint * mg/maint-difftool-vim-readonly: mergetool-lib: call vim in readonly mode for diffs | 16 March 2011, 23:47:26 UTC |
| c9b7cc0 | Junio C Hamano | 16 March 2011, 23:47:26 UTC | Merge branch 'jn/test-terminal-punt-on-osx-breakage' into maint * jn/test-terminal-punt-on-osx-breakage: tests: skip terminal output tests on OS X | 16 March 2011, 23:47:26 UTC |
| 8209b7f | Junio C Hamano | 16 March 2011, 23:47:26 UTC | Merge branch 'jk/fail-null-clone' into maint * jk/fail-null-clone: clone: die when trying to clone missing local path | 16 March 2011, 23:47:26 UTC |
| 61a6f1f | Junio C Hamano | 16 March 2011, 23:47:26 UTC | Merge branch 'jh/push-default-upstream-configname' into maint * jh/push-default-upstream-configname: push.default: Rename 'tracking' to 'upstream' | 16 March 2011, 23:47:26 UTC |
| 7633a5a | Junio C Hamano | 16 March 2011, 23:47:25 UTC | Merge branch 'mg/placeholders-are-lowercase' into maint * mg/placeholders-are-lowercase: Make <identifier> lowercase in Documentation Make <identifier> lowercase as per CodingGuidelines Make <identifier> lowercase as per CodingGuidelines Make <identifier> lowercase as per CodingGuidelines CodingGuidelines: downcase placeholders in usage messages | 16 March 2011, 23:47:25 UTC |
| bd2700d | Junio C Hamano | 16 March 2011, 23:47:25 UTC | Merge branch 'mg/patch-id' into maint * mg/patch-id: git-patch-id: do not trip over "no newline" markers git-patch-id: test for "no newline" markers | 16 March 2011, 23:47:25 UTC |
| 5b8aac3 | Junio C Hamano | 16 March 2011, 23:47:25 UTC | Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maint * js/maint-merge-use-prepare-commit-msg-hook: merge: honor prepare-commit-msg hook | 16 March 2011, 23:47:25 UTC |
| 6affdbe | Kevin Cernekee | 16 March 2011, 22:34:13 UTC | gitweb: highlight: replace tabs with spaces Consider the following code fragment: /* * test */ vim ":set list" mode shows that the first character on each line is a tab: ^I/*$ ^I * test$ ^I */$ By default, the "highlight" program will retain the tabs in the HTML output: $ highlight --fragment --syntax c test.c <span class="hl com">/*</span> <span class="hl com"> * test</span> <span class="hl com"> */</span> vim list mode: ^I<span class="hl com">/*</span>$ <span class="hl com">^I * test</span>$ <span class="hl com">^I */</span>$ In gitweb, this winds up looking something like: 1 /* 2 * test 3 */ I tried both Firefox and Opera and saw the same behavior. The desired output is: 1 /* 2 * test 3 */ This can be accomplished by specifying "--replace-tabs=8" on the highlight command line. Signed-off-by: Kevin Cernekee <cernekee@gmail.com> Acked-by: John 'Warthog9' Hawley <warthog9@eaglescrag.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 23:18:58 UTC |
| 1d679de | Carlos Martín Nieto | 16 March 2011, 16:06:17 UTC | make_absolute_path: return the input path if it points to our buffer Some codepaths call make_absolute_path with its own return value as input. In such a cases, return the path immediately. This fixes a valgrind-discovered error, whereby we tried to copy a string onto itself. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 20:51:22 UTC |
| b406a2d | Carlos Martín Nieto | 16 March 2011, 11:46:01 UTC | valgrind: ignore SSE-based strlen invalid reads Some versions of strlen use SSE to speed up the calculation and load 4 bytes at a time, even if it means reading past the end of the allocated memory. This read is safe and when the strlen function is inlined, it is not replaced by valgrind, which reports a false-possitive. Tell valgrind to ignore this particular error, as the read is, in fact, safe. Current upstream-released version 3.6.1 is affected. Some distributions have this fixed in their latest versions. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 20:19:56 UTC |
| 808a95d | Jonathan Nieder | 16 March 2011, 07:14:11 UTC | diff --submodule: split into bite-sized pieces Introduce two functions: - prepare_submodule_summary prepares the revision walker to list changes in a submodule. That is, it: * finds merge bases between the commits pointed to this path from before ("left") and after ("right") the change; * checks whether this is a fast-forward or fast-backward; * prepares a revision walk to list commits in the symmetric difference between the commits at each endpoint. It returns nonzero on error. - print_submodule_summary runs the revision walk and saves the result to a strbuf in --left-right format. The goal is just readability. No functional change intended. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 19:55:49 UTC |
| a3a32e7 | Jonathan Nieder | 16 March 2011, 07:12:48 UTC | cherry: split off function to print output lines Readers uninterested in the details of "git cherry"'s output format can see print_commit('-', commit, verbose, abbrev); and ignore the details. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 19:54:44 UTC |
| 6e0332e | Jonathan Nieder | 16 March 2011, 07:10:14 UTC | branch: split off function that writes tracking info and commit subject Introduce a add_verbose_info function that takes care of adding - an abbreviated object name; - a summary of the form [ahead x, behind y] of the relationship to the corresponding upstream branch; - a one line commit subject for the tip commit of a branch, for use in "git branch -v" output. No functional change intended. This just unindents the code a little and makes it easier to skip on first reading. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 19:52:15 UTC |
| 9cba13c | Jonathan Nieder | 16 March 2011, 07:08:34 UTC | standardize brace placement in struct definitions In a struct definitions, unlike functions, the prevailing style is for the opening brace to go on the same line as the struct name, like so: struct foo { int bar; char *baz; }; Indeed, grepping for 'struct [a-z_]* {$' yields about 5 times as many matches as 'struct [a-z_]*$'. Linus sayeth: Heretic people all over the world have claimed that this inconsistency is ... well ... inconsistent, but all right-thinking people know that (a) K&R are _right_ and (b) K&R are right. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 19:49:02 UTC |
| c6c8d0b | Jonathan Nieder | 16 March 2011, 07:00:49 UTC | compat: make gcc bswap an inline function Without this change, gcc -pedantic warns: cache.h: In function 'ce_to_dtype': cache.h:270:21: warning: ISO C forbids braced-groups within expressions [-pedantic] An inline function is more readable anyway. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 19:44:59 UTC |
| c9b6782 | Jonathan Nieder | 16 March 2011, 06:59:10 UTC | enums: omit trailing comma for portability Since v1.7.2-rc0~23^2~2 (Add per-repository eol normalization, 2010-05-19), building with gcc -std=gnu89 -pedantic produces warnings like the following: convert.c:21:11: warning: comma at end of enumerator list [-pedantic] gcc is right to complain --- these commas are not permitted in C89. In the spirit of v1.7.2-rc0~32^2~16 (2010-05-14), remove them. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 19:31:32 UTC |
| ea2c69e | Junio C Hamano | 11 March 2011, 06:41:14 UTC | Revert "core.abbrevguard: Ensure short object names stay unique a bit longer" This reverts commit 72a5b561fc1c4286bc7c5b0693afc076af261e1f, as adding fixed number of hexdigits more than necessary to make one object name locally unique does not help in futureproofing the uniqueness of names we generate today. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 March 2011, 06:41:14 UTC |
| 681186a | Mathias Lafeldt | 09 March 2011, 20:25:09 UTC | Fix typo in t/README Signed-off-by: Mathias Lafeldt <misfire@debugon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2011, 20:53:13 UTC |
| 494489a | Piotr Krukowiecki | 09 March 2011, 20:03:48 UTC | ls-remote documentation: <refs> argument is optional Correct SYNOPSIS section. Signed-off-by: Piotr Krukowiecki <piotr.krukowiecki@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2011, 20:32:00 UTC |
| 621c39d | Alexei Sholik | 08 March 2011, 13:16:10 UTC | Add Author and Documentation sections to git-for-each-ref.txt Signed-off-by: Alexei Sholik <alcosholik@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2011, 20:22:15 UTC |
| 22817b4 | Alexei Sholik | 08 March 2011, 13:16:09 UTC | Documentation: remove redundant colons in git-for-each-ref.txt Signed-off-by: Alexei Sholik <alcosholik@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2011, 19:54:56 UTC |
| d0f7dcb | Junio C Hamano | 09 March 2011, 00:58:19 UTC | SubmittingPatches: clarify the expected commit log description Earlier, 47afed5 (SubmittingPatches: itemize and reflect upon well written changes, 2009-04-28) added a discussion on the contents of the commit log message, but the last part of the new paragraph didn't make much sense. Reword it slightly to make it more readable. Update the "quicklist" to clarify what we mean by "motivation" and "contrast". Also mildly discourage external references. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2011, 05:35:22 UTC |
| e0adb84 | Adam Monsen | 08 March 2011, 20:51:37 UTC | diff format documentation: clarify --cc and -c The description was unclear if -c or --cc was the default (--cc is for some commands), and incorrectly implied that the default applies to all the diff generating commands. Most importantly, "log" does not default to "--cc" (it defaults to "--no-merges") and "log -p" obeys the user's wish to see non-combined format. Only "diff" (during merge and three-blob comparison) and "show" use --cc as the default. Signed-off-by: Adam Monsen <haircut@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 March 2011, 22:44:07 UTC |
| 841d811 | Michael J Gruber | 08 March 2011, 08:31:24 UTC | rev-list-options.txt: typo fix Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 March 2011, 19:56:37 UTC |
| b6ab349 | Michal Rokos | 07 March 2011, 12:13:15 UTC | git-compat-util.h: Honor HP C's noreturn attribute HP C for Integrity servers (Itanium) gained support for noreturn attribute sometime in 2006. It was released in Compiler Version A.06.10 and made available in July 2006. The __HP_cc define detects the HP C compiler version. Precede the __GNUC__ check so it works well when compiling with HP C using -Agcc option that enables partial support for the GNU C dialect. The -Agcc defines the __GNUC__ too. Signed-off-by: Michal Rokos <michal.rokos@nextsoft.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 March 2011, 18:58:00 UTC |
| 987893d | Michal Rokos | 07 March 2011, 11:43:11 UTC | Makefile: add NO_FNMATCH_CASEFOLD to HP-UX section fnmatch() on HP-UX does not support the GNU FNM_CASEFOLD extension, so set NO_FNMATCH_CASEFOLD to use the internal fnmatch implementation. Signed-off-by: Michal Rokos <michal.rokos@nextsoft.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 March 2011, 18:57:35 UTC |
| 964498e | Michał Kiedrowicz | 03 March 2011, 09:28:30 UTC | Documentation: fix a typo in git-apply.txt git-apply accepts the --cached option, not --cache. Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2011, 18:05:00 UTC |
| b31d202 | Nguyễn Thái Ngọc Duy | 03 March 2011, 12:34:51 UTC | init: remove unnecessary check git_dir must always be non-NULL so "if (git_dir)" is unnecessary. Before this code, if git_dir == NULL, it will default to DEFAULT_GIT_DIR_ENVIRONMENT. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2011, 23:45:10 UTC |
| d131b7a | Shawn O. Pearce | 02 March 2011, 18:01:54 UTC | sha1_file.c: Don't retain open fds on small packs If a pack file is small enough that its entire contents fits within one mmap window, mmap the file and then immediately close its file descriptor. This reduces the number of file descriptors that are needed to read from repositories with many tiny pack files, such as one that has received 1000 pushes (and created 1000 small pack files) since its last repack. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 March 2011, 19:25:30 UTC |
| 38abd9b | Erik Faye-Lund | 28 February 2011, 21:13:22 UTC | mingw: add minimum getrlimit() compatibility stub We don't have getrlimit on Windows :( Limit of 2048 taken from MSDN: http://msdn.microsoft.com/en-us/library/6e3b887c(v=vs.71).aspx Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> | 02 March 2011, 19:24:20 UTC |
| ec48d4b | Junio C Hamano | 01 March 2011, 19:26:22 UTC | verify-pack: add --stat-only to the synopsis section Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 March 2011, 19:26:22 UTC |
| c793430 | Shawn O. Pearce | 28 February 2011, 20:52:39 UTC | Limit file descriptors used by packs Rather than using 'errno == EMFILE' after a failed open() call to indicate the process is out of file descriptors and an LRU pack window should be closed, place a hard upper limit on the number of open packs based on the actual rlimit of the process. By using a hard upper limit that is below the rlimit of the current process it is not necessary to check for EMFILE on every single fd-allocating system call. Instead reserving 25 file descriptors makes it safe to assume the system call won't fail due to being over the filedescriptor limit. Here 25 is chosen as a WAG, but considers 3 for stdin/stdout/stderr, and at least a few for other Git code to operate on temporary files. An additional 20 is reserved as it is not known what the C library needs to perform other services on Git's behalf, such as nsswitch or name resolution. This fixes a case where running `git gc --auto` in a repository with more than 1024 packs (but an rlimit of 1024 open fds) fails due to the temporary output file not being able to allocate a file descriptor. The output file is opened by pack-objects after object enumeration and delta compression are done, both of which have already opened all of the packs and fully populated the file descriptor table. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2011, 21:08:31 UTC |
| 62270f6 | Eric Hanchrow | 26 February 2011, 03:29:42 UTC | branch_merged: fix grammar in warning Signed-off-by: Eric Hanchrow <eric.hanchrow@gmail.com> Helped-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2011, 08:29:58 UTC |
| 2140b14 | Jonathan Nieder | 25 February 2011, 09:07:57 UTC | commit: error out for missing commit message template When "git commit" was rewritten in C (v1.5.4-rc0~78^2~30, 2007-11-08), a subtle bug in --template was introduced. If the file named by a --template parameter is missing, previously git would error out with a message: Commit template file does not exist. but in the C version the --template parameter gets ignored and the default template is used. t7500 has two tests for this case which would have caught it, except that with the default $EDITOR, the commit message template is left unmodified, causing 'git commit' to error out and the test to succeed. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2011, 20:13:55 UTC |
| 853c0ff | Michael J Gruber | 25 February 2011, 09:36:39 UTC | mergetool-lib: call vim in readonly mode for diffs When [g]vimdiff is called for files which are opened already, the editor complains about the existing swap file. But we do not want to write anything when called from difftool. So, make difftool use "-R" for the vim family. This - prevents the use of a swap file and - marks the buffers readonly. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2011, 20:00:28 UTC |
| abb371a | Jeff King | 19 February 2011, 08:16:32 UTC | diff: don't retrieve binary blobs for diffstat We only need the size, which is much cheaper to get, especially if it is a big binary file. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2011, 18:58:18 UTC |
| ded0abc | Jeff King | 19 February 2011, 08:04:56 UTC | diff: handle diffstat of rewritten binary files The logic in builtin_diffstat assumes that a complete_rewrite pair should have its lines counted. This is nonsensical for binary files and leads to confusing things like: $ git diff --stat --summary HEAD^ HEAD foo.rand | Bin 4096 -> 4096 bytes 1 files changed, 0 insertions(+), 0 deletions(-) $ git diff --stat --summary -B HEAD^ HEAD foo.rand | 34 +++++++++++++++------------------- 1 files changed, 15 insertions(+), 19 deletions(-) rewrite foo.rand (100%) So let's reorder the function to handle binary files first (which from diffstat's perspective look like complete rewrites anyway), then rewrites, then actual diffstats. There are two bonus prizes to this reorder: 1. It gets rid of a now-superfluous goto. 2. The binary case is at the top, which means we can further optimize it in the next patch. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2011, 18:57:58 UTC |
| 4cc6260 | Clemens Buchacher | 21 February 2011, 20:05:25 UTC | Documentation: clarify -u<mode> option defaults Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2011, 05:48:55 UTC |
| d5a719e | Ævar Arnfjörð Bjarmason | 19 February 2011, 18:29:09 UTC | t/t7500-commit.sh: use test_cmp instead of test Change commit_msg_is() in t/t7500-commit.sh to use test_cmp instead of the shell's test function. Now if a test fails we'll get test_cmp output showing us what failed. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 February 2011, 18:55:53 UTC |
| 49151d8 | Ævar Arnfjörð Bjarmason | 19 February 2011, 18:16:19 UTC | t/gitweb-lib.sh: Ensure that errors are shown for --debug --immediate Because '--immediate' stops test suite after first error, therefore in this mode test_debug 'cat gitweb.log' was never ran, thus in effect negating effect of '--debug' option. This made finidng the cause of errors in gitweb test sute difficult. Modify the gitweb_run test subroutine to run test_debug itself in the case of errors (and also remove "test_debug 'cat gitweb.log'" from gitweb tests). This makes it possible to run *gitweb tests* with --immediate ---debug combination of options; also it makes gitweb tests to not output spurious debug data that is not considered error. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Jakub Narębski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 February 2011, 18:38:40 UTC |
| 98885c2 | Ævar Arnfjörð Bjarmason | 19 February 2011, 15:27:42 UTC | gitweb/gitweb.perl: don't call S_ISREG() with undef Change S_ISREG($to_mode_oct) to S_ISREG($from_mode_oct) in the branch that handles from modes, not to modes. This logic appears to have been caused by copy/paste programming by Jakub Narebski in e8e41a93. It would be better to rewrite this code not to be duplicated, but I haven't done so. This issue caused a failing test on perl 5.13.9, which has a warning that turned this up: gitweb.perl: Use of uninitialized value in subroutine entry at /home/avar/g/git/t/../gitweb/gitweb.perl line 4415. Which caused the Git test suite to fail on this test: ./t9500-gitweb-standalone-no-errors.sh (Wstat: 256 Tests: 90 Failed: 84) Failed tests: 1-8, 10-36, 38-45, 47-48, 50-88 Non-zero exit status: 1 Reported-by: perl 5.13.9 Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 February 2011, 18:37:31 UTC |
| 0f54b7d | Ævar Arnfjörð Bjarmason | 19 February 2011, 15:27:41 UTC | gitweb/gitweb.perl: remove use of qw(...) as parentheses Using the qw(...) construct as implicit parentheses was deprecated in perl 5.13.5. Change the relevant code in gitweb to not use the deprecated construct. The offending code was introduced in 3562198b by Jakub Narebski. The issue is that perl will now warn about this: $ perl -wE 'for my $i qw(a b) { say $i }' Use of qw(...) as parentheses is deprecated at -e line 1. a b This caused gitweb.perl to warn on perl 5.13.5 and above, and these tests to fail on those perl versions: ./t9501-gitweb-standalone-http-status.sh (Wstat: 256 Tests: 11 Failed: 10) Failed tests: 2-11 Non-zero exit status: 1 ./t9502-gitweb-standalone-parse-output.sh (Wstat: 256 Tests: 10 Failed: 9) Failed tests: 2-10 Non-zero exit status: 1 Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Acked-by: Jakub Narębski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 February 2011, 18:36:56 UTC |
| 3a4d676 | Linus Torvalds | 19 February 2011, 04:12:06 UTC | diffcore-rename: improve estimate_similarity() heuristics The logic to quickly dismiss potential rename pairs was broken. It would too eagerly dismiss possible renames when all of the difference was due to pure new data (or deleted data). Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 February 2011, 06:26:45 UTC |
| 0940e5f | Linus Torvalds | 19 February 2011, 04:10:32 UTC | diffcore-rename: properly honor the difference between -M and -C We would allow rename detection to do copy detection even when asked purely for renames. That confuses users, but more importantly it can terminally confuse the recursive merge rename logic. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 February 2011, 06:26:28 UTC |
| 11f944d | Linus Torvalds | 19 February 2011, 03:55:19 UTC | for_each_hash: allow passing a 'void *data' pointer to callback For the find_exact_renames() function, this allows us to pass the diff_options structure pointer to the low-level routines. We will use that to distinguish between the "rename" and "copy" cases. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 February 2011, 06:25:51 UTC |
| a902618 | Jeff King | 18 February 2011, 04:01:52 UTC | clone: die when trying to clone missing local path Since 86ac751 (Allow cloning an empty repository, 2009-01-23), doing: git clone does-not-exist has created does-not-exist as an empty repository. This was an unintentional side effect of 86ac751. Even weirder, doing: git clone does-not-exist new-dir _does_ fail, making this "feature" (if you want to consider it such) broken. Let's detect this situation and explicitly die. It's almost certainly not what the user intended. This patch also adds two tests. One for the missing path case, and one to confirm that a similar case, cloning a non-repository directory, fails. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2011, 15:05:54 UTC |
| 339e563 | Jonathan Nieder | 17 February 2011, 12:38:52 UTC | tests: skip terminal output tests on OS X On Mac OS X 10.5.0, test_terminal gets stuck reading from the pty master every once in a while. To reproduce the problem: perl -MIO::Pty -MFile::Copy -e ' for (my $i = 0;; $i++) { my $master = new IO::Pty; my $slave = $master->slave; if (fork == 0) { close $master or die "close: $!"; open STDOUT, ">&", $slave or die "dup2: $!"; close $slave or die "close: $!"; exec("echo", "hi", $i) or die "exec: $!"; } close $slave or die "close: $!"; copy($master, \*STDOUT) or die "copy: $!"; close $master or die "close: $!"; wait; } ' It blocks after 7000 iterations or so in sysread(). The relevant sysread() call is the second call by the parent, which presumably executes before the child dies but after the parent has read all output from there. Since this is an intermitent problem, the quick check of terminal support in lib-terminal doesn't catch it. Skip these tests on the Mac for now. Noticed-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2011, 23:50:37 UTC |
| b200021 | Spencer E. Olson | 17 February 2011, 16:18:46 UTC | t7406: "git submodule update {--merge|--rebase]" with new submodules Add two test cases in t7406 to ensure that the --merge/--rebase options are ignored for "git submodule update" with new modules. These test that a simple checkout is performed instead. Signed-off-by: Spencer E. Olson <olsonse@umich.edu> Acked-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2011, 20:25:17 UTC |
| 1b4735d | Spencer E. Olson | 17 February 2011, 16:18:45 UTC | submodule: no [--merge|--rebase] when newly cloned "git submodule update" can be run with either the "--merge" or "--rebase" option, or submodule.<name>.update configuration variable can be set to "merge" or "rebase, to cause local work to get integrated when updating the submodule. When a submodule is newly cloned, however, it does not have a check out when a rebase or merge is attempted, leading to a failure. For newly cloned submodules, simply check out the appropriate revision. There is no local work to integrate with for them. Signed-off-by: Spencer E. Olson <olsonse@umich.edu> Acked-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2011, 20:19:18 UTC |
| 2485eab | Michael J Gruber | 17 February 2011, 07:44:42 UTC | git-patch-id: do not trip over "no newline" markers Currently, patch-id trips over our very own diff extension for marking the absence of newline at EOF. Fix it. (Ignore it, it's whitespace.) Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2011, 19:56:50 UTC |
| f2b5e7a | Michael J Gruber | 16 February 2011, 16:55:37 UTC | git-patch-id: test for "no newline" markers Currently, patch-id trips over our very own output that marks the absence of newline at EOF. Expose this in a test. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2011, 19:54:57 UTC |
| 3b0d240 | Michael J Gruber | 17 February 2011, 07:48:06 UTC | Make <identifier> lowercase in Documentation Leaving uppercase abbreviations (e.g. URL) and an identifier named after an upercase env variable (CVSROOT) in place, this adjusts the few remaining cases and fixes an unidentified identifier along the way. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2011, 19:49:54 UTC |
| 759e84f | Junio C Hamano | 16 February 2011, 22:33:11 UTC | Merge branch 'maint-1.7.3' into maint * maint-1.7.3: | 16 February 2011, 22:33:11 UTC |
| da656f1 | Junio C Hamano | 16 February 2011, 22:32:59 UTC | Merge branch 'maint-1.7.2' into maint-1.7.3 * maint-1.7.2: fast-import: introduce "feature notes" command fast-import: clarify documentation of "feature" command | 16 February 2011, 22:32:59 UTC |
| 6a7f71d | Junio C Hamano | 16 February 2011, 22:32:54 UTC | Merge branch 'maint-1.7.1' into maint-1.7.2 * maint-1.7.1: fast-import: introduce "feature notes" command fast-import: clarify documentation of "feature" command | 16 February 2011, 22:32:54 UTC |
| 206af7c | Junio C Hamano | 16 February 2011, 22:32:47 UTC | Merge branch 'maint-1.7.0' into maint-1.7.1 * maint-1.7.0: fast-import: introduce "feature notes" command fast-import: clarify documentation of "feature" command | 16 February 2011, 22:32:47 UTC |
| 53c4031 | Johan Herland | 16 February 2011, 00:54:24 UTC | push.default: Rename 'tracking' to 'upstream' Users are sometimes confused with two different types of "tracking" behavior in Git: "remote-tracking" branches (e.g. refs/remotes/*/*) versus the merge/rebase relationship between a local branch and its @{upstream} (controlled by branch.foo.remote and branch.foo.merge config settings). When the push.default is set to 'tracking', it specifies that a branch should be pushed to its @{upstream} branch. In other words, setting push.default to 'tracking' applies only to the latter of the above two types of "tracking" behavior. In order to make this more understandable to the user, we rename the push.default == 'tracking' option to push.default == 'upstream'. push.default == 'tracking' is left as a deprecated synonym for 'upstream'. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2011, 18:21:52 UTC |
| 8559425 | Nguyễn Thái Ngọc Duy | 14 February 2011, 13:02:51 UTC | parse_tag_buffer(): do not prefixcmp() out of range There is a check (size < 64) at the beginning of the function, but that only covers object+type lines. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2011, 18:05:14 UTC |
| 65969d4 | Jay Soffian | 15 February 2011, 01:07:50 UTC | merge: honor prepare-commit-msg hook When a merge is stopped due to conflicts or --no-commit, the subsequent commit calls the prepare-commit-msg hook. However, it is not called after a clean merge. Fix this inconsistency by invoking the hook after clean merges as well. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2011, 21:35:35 UTC |
| 41dbcd4 | Michael J Gruber | 15 February 2011, 13:09:13 UTC | Make <identifier> lowercase as per CodingGuidelines *.c part for matches with '<[A-Z]+>' (and affected test). Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2011, 19:53:11 UTC |
| 23c6a80 | Michael J Gruber | 15 February 2011, 13:09:12 UTC | Make <identifier> lowercase as per CodingGuidelines *.c part for matches with '"[A-Z]+"'. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2011, 19:53:10 UTC |
| 1d5006a | Michael J Gruber | 15 February 2011, 13:09:11 UTC | Make <identifier> lowercase as per CodingGuidelines parse-options part Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2011, 19:53:09 UTC |
| b1afe49 | Junio C Hamano | 15 February 2011, 19:02:56 UTC | CodingGuidelines: downcase placeholders in usage messages We accumulated some inconsistencies without an explicit guidance to spell this out over time. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2011, 19:53:00 UTC |
| 24231e0 | Michael J Gruber | 14 February 2011, 16:48:08 UTC | pull: do not display fetch usage on --help-all Currently, "git pull --help-all" displays the fetch usage info. Make it equivalent to "git pull -h" instead since "--help-all" is documented in gitcli(7). Do not try to sanitize the pull option parser (aka last hair puller). Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2011, 18:53:24 UTC |
| cfb5e6b | Michael J Gruber | 15 February 2011, 13:09:10 UTC | git-tag.txt: list all modes in the description Currently, the description sounds as if it applied always, but most of its content is true in "create tag mode" only. Make this clearer by listing all modes upfront. Also, sneak in some linguistic improvements and make it clearer that lightweight tags are "created" because "written" may be misread as "are output". Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2011, 18:51:08 UTC |
| 8547090 | Michael J Gruber | 15 February 2011, 13:09:09 UTC | commit,status: describe -u likewise They differ by one character only. Being exactly equal should help translations. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2011, 18:51:08 UTC |
| 08918e4 | Michael J Gruber | 15 February 2011, 13:09:08 UTC | add: describe --patch like checkout, reset Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2011, 18:51:08 UTC |
| 3f40617 | Michael J Gruber | 15 February 2011, 13:09:07 UTC | commit,merge,tag: describe -m likewise This also removes the superfluous "specify" and rewords the misleading "if any" which sounds as if omitting "-m" would omit the merge commit message. (It means "if a merge commit is created at all".) Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2011, 18:51:08 UTC |
| 5027fa8 | Michael J Gruber | 15 February 2011, 13:09:06 UTC | clone,init: describe --template using the same wording This also corrects a wrong description for clone. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2011, 18:51:08 UTC |
| ba9d7fe | Michael J Gruber | 15 February 2011, 13:09:05 UTC | commit,status: describe --porcelain just like push Push has the clearer description, so take that one for all. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2011, 18:51:08 UTC |
| 726c4e3 | Michael J Gruber | 15 February 2011, 13:09:04 UTC | commit,tag: use same wording for -F Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2011, 18:51:08 UTC |
| 48d9e6a | Masatake Osanai | 14 February 2011, 22:13:04 UTC | perl: command_bidi_pipe() method should set-up git environmens When command_input_pipe and command_output_pipe are used as a method of a Git::repository instance, they eventually call into _cmd_exec method that sets up the execution environment such as GIT_DIR, GIT_WORK_TREE environment variables and the current working directory in the child process that interacts with the repository. command_bidi_pipe however didn't expect to be called as such, and lacked all these set-up. Because of this, a program that did this did not work as expected: my $repo = Git->repository(Directory => '/some/where/else'); my ($pid, $in, $out, $ctx) = $repo->command_bidi_pipe(qw(hash-object -w --stdin-paths)); This patch refactors the _cmd_exec into _setup_git_cmd_env that sets up the execution environment, and makes _cmd_exec and command_bidi_pipe to use it. Note that unlike _cmd_exec that execv's a git command as an external process, command_bidi_pipe is called from the main line of control, and the execution environment needs to be restored after open2() does its magic. Signed-off-by: Masatake Osanai <unpush@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2011, 23:28:13 UTC |
| 1e58dba | Ralf Wildenhues | 02 January 2011, 10:24:55 UTC | configure: use AC_LANG_PROGRAM consistently Avoid warnings from Autoconf 2.68 about missing use of AC_LANG_PROGRAM and friends. Quoting autoconf-2.68/NEWS: ** The macros AC_PREPROC_IFELSE, AC_COMPILE_IFELSE, AC_LINK_IFELSE, and AC_RUN_IFELSE now warn if the first argument failed to use AC_LANG_SOURCE or AC_LANG_PROGRAM to generate the conftest file contents. A new macro AC_LANG_DEFINES_PROVIDED exists if you have a compelling reason why you cannot use AC_LANG_SOURCE but must avoid the warning. The underlying reason for that change is that AC_LANG_{SOURCE,PROGRAM} take care to supply the previously computed set of #defines (and include standard headers if so desired) for preprocessed languages like C and C++. In some cases, AC_LANG_PROGRAM is already used but not sufficiently m4-quoted, so we just need to add another set of [quotes] to prevent the autoconf warning from being triggered bogusly. Quoting all arguments (except when calling special macros that need to be expanded before recursion) is better style, anyway. These and more rules are described in detail in 'info Autoconf "Programming in M4"'. No change in the resulting config.mak.autogen after running ./configure intended. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2011, 18:55:15 UTC |
| 62b8102 | Jeff King | 12 February 2011, 05:18:51 UTC | string_list_append: always set util pointer to NULL It is not immediately obvious that the util field may contain random bytes after appending an item. Especially since the string_list_insert* functions _do_ explicitly zero the util pointer. This does not appear to be a bug in any current git code, as all callers either fill in the util field immediately or never use it. However, it is worth it to be less surprising to new users of the string-list API who may expect it to be intialized to NULL. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2011, 18:55:03 UTC |
| dab0d41 | Jonathan Nieder | 07 February 2011, 08:17:27 UTC | correct type of EMPTY_TREE_SHA1_BIN Functions such as hashcmp that expect a binary SHA-1 value take parameters of type "unsigned char *" to avoid accepting a textual SHA-1 passed by mistake. Unfortunately, this means passing the string literal EMPTY_TREE_SHA1_BIN requires an ugly cast. Tweak the definition of EMPTY_TREE_SHA1_BIN to produce a value of more convenient type. In the future the definition might change to extern const unsigned char empty_tree_sha1_bin[20]; #define EMPTY_TREE_SHA1_BIN empty_tree_sha1_bin Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2011, 18:48:06 UTC |
| 9971d6d | Junio C Hamano | 11 February 2011, 22:39:55 UTC | Git 1.7.4.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2011, 22:39:55 UTC |
| b76bf72 | Junio C Hamano | 11 February 2011, 22:26:10 UTC | Merge branch 'jc/fsck-fixes' into maint * jc/fsck-fixes: fsck: do not give up too early in fsck_dir() fsck: drop unused parameter from traverse_one_object() | 11 February 2011, 22:26:10 UTC |
| 3446a54 | Chris Packham | 10 February 2011, 22:59:31 UTC | clone: fixup recurse_submodules option The recurse_submodules option was added in ccdd3da6 to bring 'git clone' into line with 'git fetch' and future commands. The correct option should have been "recurse-submodules". Signed-off-by: Chris Packham <judge.packham@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2011, 22:24:34 UTC |
| 7532345 | Jonathan Nieder | 11 February 2011, 10:36:44 UTC | svn-fe: warn about experimental status svn-fe is young and some coming cleanups might involve backward incompatible UI changes. Add some words of warning to the manual so early adopters that are not following the project closely don't get burned. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2011, 18:13:14 UTC |
| 1368f65 | Jonathan Nieder | 11 October 2010, 02:59:26 UTC | compat: helper for detecting unsigned overflow The idiom (a + b < a) works fine for detecting that an unsigned integer has overflowed, but a more explicit unsigned_add_overflows(a, b) might be easier to read. Define such a macro, expanding roughly to ((a) < UINT_MAX - (b)). Because the expansion uses each argument only once outside of sizeof() expressions, it is safe to use with arguments that have side effects. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2011, 21:47:56 UTC |
| a8e4a59 | Junio C Hamano | 10 February 2011, 00:40:12 UTC | Merge branch 'maint-1.7.0' into maint * maint-1.7.0: fast-import: introduce "feature notes" command fast-import: clarify documentation of "feature" command Conflicts: Documentation/git-fast-import.txt | 10 February 2011, 00:40:12 UTC |
