| 537f6c7 | Junio C Hamano | 06 April 2010, 22:00:01 UTC | Git 1.7.1-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 April 2010, 22:00:01 UTC |
| b807c52 | Junio C Hamano | 06 April 2010, 21:50:47 UTC | Merge branch 'da/maint-python-startup' * da/maint-python-startup: Makefile: Remove usage of deprecated Python "has_key" method | 06 April 2010, 21:50:47 UTC |
| 4a8295f | Junio C Hamano | 06 April 2010, 21:50:47 UTC | Merge branch 'ic/bash-completion-rpm' * ic/bash-completion-rpm: RPM spec: include bash completion support | 06 April 2010, 21:50:47 UTC |
| ae722b4 | Junio C Hamano | 06 April 2010, 21:50:46 UTC | Merge branch 'sb/fmt-merge-msg' * sb/fmt-merge-msg: fmt-merge-msg: hide summary option fmt-merge-msg: remove custom string_list implementation string-list: add unsorted_string_list_lookup() fmt-merge-msg: use pretty.c routines t6200: test fmt-merge-msg more t6200: modernize with test_tick fmt-merge-msg: be quiet if nothing to merge | 06 April 2010, 21:50:46 UTC |
| 3f3f8d9 | Junio C Hamano | 06 April 2010, 21:50:46 UTC | Merge branch 'jc/conflict-marker-size' * jc/conflict-marker-size: diff --check: honor conflict-marker-size attribute | 06 April 2010, 21:50:46 UTC |
| f9bdf9b | Junio C Hamano | 06 April 2010, 21:50:46 UTC | Merge branch 'ef/maint-empty-commit-log' * ef/maint-empty-commit-log: rev-list: fix --pretty=oneline with empty message | 06 April 2010, 21:50:46 UTC |
| 15bf052 | Junio C Hamano | 06 April 2010, 21:50:45 UTC | Merge branch 'sg/bash-completion' * sg/bash-completion: bash: completion for gitk aliases bash: support user-supplied completion scripts for aliases bash: support user-supplied completion scripts for user's git commands bash: improve aliased command recognition | 06 April 2010, 21:50:45 UTC |
| 8b5fe8c | Junio C Hamano | 05 April 2010, 17:16:11 UTC | Revert "Link against libiconv on IRIX" Brandon Casey reports: Subject: Re: [PATCH] Link against libiconv on IRIX Date: Mon, 05 Apr 2010 11:45:32 -0500 Message-Id: <1UypQMCHLT57SnjSQIM66RTkLalsvavG8xXoQJv4rEQ@cipher.nrlssc.navy.mil> This breaks compilation on IRIX 6.5.29m for me since there is no separate libiconv.so. What version of IRIX are you using? On my system, even the iconv utility doesn't link against a libiconv shared object. It seems the iconv functionality is in libc. # ldd /usr/bin/iconv libc.so.1 => /usr/lib32/libc.so.1 Could it be that you are using a third party iconv library? I've experienced this on another system and the problem was related to curl. In that case, curl was linked against an external iconv and not the native library, so if I tried to build with curl support, I had to also build against the external iconv library. While we wait for an improved solution, revert the regression caused by 21704227904b51197976c61c595b52d807677533. | 05 April 2010, 17:16:11 UTC |
| 11766ca | Junio C Hamano | 04 April 2010, 17:23:21 UTC | Merge branch 'maint' * maint: pack-protocol.txt: fix pkt-line lengths pack-protocol.txt: fix spelling | 04 April 2010, 17:23:21 UTC |
| c8a9790 | Tay Ray Chuan | 04 April 2010, 13:12:17 UTC | pack-protocol.txt: fix pkt-line lengths Previously, the lengths were 4-bytes short. Fix it such that the lengths reflect the total length of the pkt-line, as per spec. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 April 2010, 17:18:21 UTC |
| 8e50175 | Tay Ray Chuan | 04 April 2010, 13:12:16 UTC | pack-protocol.txt: fix spelling s/paramater/parameter/. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 April 2010, 17:18:19 UTC |
| 9234b00 | Junio C Hamano | 03 April 2010, 19:28:44 UTC | Merge branch 'mb/rebase-i-no-ff' * mb/rebase-i-no-ff: Teach rebase the --no-ff option. Conflicts: git-rebase--interactive.sh t/t3404-rebase-interactive.sh | 03 April 2010, 19:28:44 UTC |
| 7b1cb5c | Junio C Hamano | 03 April 2010, 19:28:43 UTC | Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' * sp/maint-http-backend-die-triggers-die-recursively: http-backend: Don't infinite loop during die() | 03 April 2010, 19:28:43 UTC |
| 9b5a7c4 | Junio C Hamano | 03 April 2010, 19:28:42 UTC | Merge branch 'rr/imap-send-unconfuse-from-line' * rr/imap-send-unconfuse-from-line: imap-send: Remove limitation on message body | 03 April 2010, 19:28:42 UTC |
| aa4beff | Junio C Hamano | 03 April 2010, 19:28:42 UTC | Merge branch 'mg/use-default-abbrev-length-in-rev-list' * mg/use-default-abbrev-length-in-rev-list: rev-list: use default abbrev length when abbrev-commit is in effect | 03 April 2010, 19:28:42 UTC |
| aa8b125 | Junio C Hamano | 03 April 2010, 19:28:42 UTC | Merge branch 'mg/maint-send-email-lazy-editor' * mg/maint-send-email-lazy-editor: send-email: lazily assign editor variable | 03 April 2010, 19:28:42 UTC |
| 4de113c | Junio C Hamano | 03 April 2010, 19:28:41 UTC | Merge branch 'rb/maint-python-path' * rb/maint-python-path: Correct references to /usr/bin/python which does not exist on FreeBSD | 03 April 2010, 19:28:41 UTC |
| 16b8a3e | Junio C Hamano | 03 April 2010, 19:28:41 UTC | Merge branch 'jn/merge-diff3-label' * jn/merge-diff3-label: merge-recursive: add a label for ancestor cherry-pick, revert: add a label for ancestor revert: clarify label on conflict hunks compat: add mempcpy() checkout -m --conflict=diff3: add a label for ancestor merge_trees(): add ancestor label parameter for diff3-style output merge_file(): add comment explaining behavior wrt conflict style checkout --conflict=diff3: add a label for ancestor ll_merge(): add ancestor label parameter for diff3-style output merge-file --diff3: add a label for ancestor xdl_merge(): move file1 and file2 labels to xmparam structure xdl_merge(): add optional ancestor label to diff3-style output tests: document cherry-pick behavior in face of conflicts tests: document format of conflicts from checkout -m Conflicts: builtin/revert.c | 03 April 2010, 19:28:41 UTC |
| 40a56f4 | Junio C Hamano | 03 April 2010, 19:28:40 UTC | Merge branch 'ef/cherry-abbrev' * ef/cherry-abbrev: ls: remove redundant logic cherry: support --abbrev option | 03 April 2010, 19:28:40 UTC |
| 0cb050a | Junio C Hamano | 03 April 2010, 19:28:40 UTC | Merge branch 'bw/template-tool-buildconfig' * bw/template-tool-buildconfig: Modernize git calling conventions in hook templates Make templates honour SHELL_PATH and PERL_PATH | 03 April 2010, 19:28:40 UTC |
| 59d1e01 | Junio C Hamano | 03 April 2010, 19:28:40 UTC | Merge branch 'mg/mailmap-update' * mg/mailmap-update: .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela | 03 April 2010, 19:28:40 UTC |
| c2c6bcd | Junio C Hamano | 03 April 2010, 19:28:40 UTC | Merge branch 'bc/t5505-fix' * bc/t5505-fix: t/t5505-remote.sh: escape * to prevent interpretation by shell as glob t5505: add missing && t5505: remove unnecessary subshell invocations | 03 April 2010, 19:28:40 UTC |
| f40805b | Junio C Hamano | 03 April 2010, 19:28:40 UTC | Merge branch 'gh/maint-stash-show-error-message' * gh/maint-stash-show-error-message: Improve error messages from 'git stash show' | 03 April 2010, 19:28:40 UTC |
| 07b838f | Junio C Hamano | 03 April 2010, 19:28:39 UTC | Merge branch 'rs/threaded-grep-context' * rs/threaded-grep-context: grep: enable threading for context line printing Conflicts: grep.c | 03 April 2010, 19:28:39 UTC |
| d718dd0 | Junio C Hamano | 03 April 2010, 19:28:39 UTC | Merge branch 'bc/maint-daemon-sans-ss-family' * bc/maint-daemon-sans-ss-family: daemon.c: avoid accessing ss_family member of struct sockaddr_storage | 03 April 2010, 19:28:39 UTC |
| a59cb82 | Junio C Hamano | 03 April 2010, 19:28:39 UTC | Merge branch 'bc/acl-test' * bc/acl-test: t/t1304: make a second colon optional in the mask ACL check t/t1304: set the ACL effective rights mask t/t1304: use 'test -r' to test readability rather than looking at mode bits t/t1304: set the Default ACL base entries t/t1304: avoid -d option to setfacl | 03 April 2010, 19:28:39 UTC |
| 8479c68 | Junio C Hamano | 03 April 2010, 19:28:39 UTC | Merge branch 'ja/send-email-ehlo' * ja/send-email-ehlo: git-send-email.perl - try to give real name of the calling host to HELO/EHLO git-send-email.perl: add option --smtp-debug git-send-email.perl: improve error message in send_message() | 03 April 2010, 19:28:39 UTC |
| df9930c | Junio C Hamano | 03 April 2010, 19:28:38 UTC | Merge branch 'do/rebase-i-arbitrary' * do/rebase-i-arbitrary: rebase--interactive: don't require what's rebased to be a branch Conflicts: t/t3404-rebase-interactive.sh | 03 April 2010, 19:28:38 UTC |
| 7135046 | Junio C Hamano | 03 April 2010, 19:28:38 UTC | Merge branch 'ak/everyday-git' * ak/everyday-git: everyday: fsck and gc are not everyday operations | 03 April 2010, 19:28:38 UTC |
| ecebd1e | Jonathan Nieder | 03 April 2010, 07:47:00 UTC | Makefile: future-proof Cygwin version check Tweak the condition that detects old Cygwin versions to not include versions such as 1.8, 1.11, and 2.1. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 April 2010, 18:26:35 UTC |
| 6555b19 | YONETANI Tomokazu | 02 April 2010, 07:52:09 UTC | Fix _XOPEN_SOURCE problem on DragonFly As on FreeBSD, defining _XOPEN_SOURCE to 600 on DragonFly BSD 2.4-RELEASE or later hides symbols from programs, which leads to implicit declaration of functions, making the return value to be assumed an int. On architectures where sizeof(int) < sizeof(void *), this can cause unexpected behaviors or crashes. This change won't affect other OSes unless they define __DragonFly__ macro, or older versions of DragonFly BSD as the current git code doesn't rely on the features only available with _XOPEN_SOURCE set to 600 on DragonFly. Signed-off-by: YONETANI Tomokazu <y0netan1@dragonflybsd.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 April 2010, 04:24:30 UTC |
| 1f2362a | Markus Heidelberg | 02 April 2010, 12:27:19 UTC | builtin/commit: remove unnecessary variable definition The file descriptor is already defined at the beginning of the function. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2010, 18:38:00 UTC |
| 7327623 | Markus Heidelberg | 02 April 2010, 12:27:18 UTC | builtin/commit: fix duplicated sentence in a comment Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2010, 18:37:03 UTC |
| 2c4dc02 | Eric Raymond | 02 April 2010, 10:10:11 UTC | Integrate version 3 ciabot scripts into contrib/. These have been extensively live-tested in the last week. The version 2 ciabot.sh maintainer has passed the baton to me; ciabot.py is original. Signed-off-by: Eric S. Raymond <esr@thyrsus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2010, 16:19:17 UTC |
| a50dec2 | Eric Blake | 01 April 2010, 22:43:54 UTC | Makefile: update defaults for modern Cygwin Now that Cygwin 1.7.x has enabled lots of new features, and Cygwin 1.5 is no longer actively supported by the Cygwin mailing lists, we might as well update the defaults to cater to those new features. NO_TRUSTABLE_FILEMODE is only necessary on FAT drives; the Cygwin community recommends NTFS drives, but there is still too much use for FAT to switch the default. Likewise, UNRELIABLE_FSTAT is probably file-system specific, but worth keeping unchanged. This commit does not change the default for NO_MMAP, although definitive proof of whether this option is necessary is lacking. Signed-off-by: Eric Blake <eblake@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2010, 06:43:16 UTC |
| 890a13a | Junio C Hamano | 31 March 2010, 22:14:27 UTC | Sync with 1.7.0.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2010, 22:14:27 UTC |
| 2be10bb | Junio C Hamano | 31 March 2010, 22:12:08 UTC | Git 1.7.0.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2010, 22:12:08 UTC |
| 970957d | Junio C Hamano | 31 March 2010, 22:09:32 UTC | Merge branch 'jc/maint-refs-dangling' into maint * jc/maint-refs-dangling: refs: ref entry with NULL sha1 is can be a dangling symref | 31 March 2010, 22:09:32 UTC |
| 4318d3b | Holger Weiß | 29 March 2010, 11:02:37 UTC | Documentation: show-ref <pattern>s are optional Specifying one or more <pattern> parameters is optional when calling show-ref, so mark them as such using brackets in the manual. Signed-off-by: Holger Weiß <holger@zedat.fu-berlin.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2010, 21:22:17 UTC |
| 2170422 | Holger Weiß | 29 March 2010, 10:57:48 UTC | Link against libiconv on IRIX On IRIX, "-liconv" must be added to the linker command line in order to get iconv(3) support; set the according Makefile variable appropriately. Signed-off-by: Holger Weiß <holger@zedat.fu-berlin.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2010, 21:22:06 UTC |
| 21e403a | Holger Weiß | 29 March 2010, 10:22:19 UTC | Don't redefine htonl and ntohl on big-endian Since commit 0fcabdeb52b79775173d009ccc179db104dfbb66, compat/bswap.h redefined htonl and ntohl to bswap32 not only if bswap32 has been defined earlier in compat/bswap.h (which is done only on selected platforms), but also if bswap32 has been defined anywhere else. This broke Git at least for NetBSD systems running on big-endian machines (where ntohl and htonl should, of course, be NOOPs), since NetBSD defines a bswap32 macro in the system headers. So, we now undefine any previously defined bswap32 in compat/bswap.h before defining our own. Signed-off-by: Holger Weiß <holger@zedat.fu-berlin.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2010, 21:21:39 UTC |
| 7a49c25 | Jakub Narebski | 27 March 2010, 19:26:59 UTC | gitweb: git_get_project_config requires only $git_dir, not also $project Fix overeager early return in git_get_project_config, introduced in 9be3614 (gitweb: Fix project-specific feature override behavior, 2010-03-01). When git_get_project_config is called from projects list page via git_get_project_owner($path) etc., it is called with $git_dir defined (in git_get_project_owner($path) etc.), but $project variable is not defined. git_get_project_config doesn't use $project variable anyway. Reported-by: Tobias Heinlein <keytoaster@gentoo.org> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2010, 17:57:04 UTC |
| e476286 | Jan Stępień | 31 March 2010, 09:24:19 UTC | Updated the usage string of git reset Make git reset usage string reflect the command's behaviour and contents of the man page. Signed-off-by: Jan Stępień <jstepien@users.sourceforge.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2010, 15:15:02 UTC |
| 09f53b1 | Greg Bacon | 30 March 2010, 17:20:57 UTC | Documentation: Clarify support for smart HTTP backend In the description of http.getanyfile, replace the vague "older Git clients" with the earliest release whose client is able to use the upload pack service. Signed-off-by: Greg Bacon <gbacon@dbresearch.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2010, 23:49:19 UTC |
| 852f098 | Johannes Sixt | 30 March 2010, 07:46:23 UTC | Windows: fix utime() for read-only files Starting with 5256b00 (Use git_mkstemp_mode instead of plain mkstemp to create object files, 2010-02-22) utime() is invoked on read-only files. This is not allowed on Windows and results in many warnings of the form failed utime() on .git/objects/23/tmp_obj_VlgHlc: Permission denied during a repack. Fix it by making the file temporarily writable. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2010, 23:34:04 UTC |
| da1fbed | Johannes Sixt | 30 March 2010, 17:36:03 UTC | diff: fix textconv error zombies To make the code simpler, run_textconv lumps all of its error checking into one conditional. However, the short-circuit means that an error in reading will prevent us from calling finish_command, leaving a zombie child. Clean up properly after errors. Based-on-work-by: Jeff King <peff@peff.net> Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2010, 21:46:33 UTC |
| 87b3c01 | Junio C Hamano | 30 March 2010, 04:29:24 UTC | Merge branch 'maint' * maint: format-patch: Squelch 'fatal: Not a range." error | 30 March 2010, 04:29:24 UTC |
| 657ab61 | Kevin Ballard | 30 March 2010, 02:46:38 UTC | format-patch: Squelch 'fatal: Not a range." error Don't output an error on `git format-patch --ignore-if-in-upstream HEAD`. This matches the behavior of `git format-patch HEAD`. Signed-off-by: Kevin Ballard <kevin@sb.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2010, 04:22:37 UTC |
| 3bfdf87 | Ian Ward Comfort | 26 March 2010, 08:39:57 UTC | RPM spec: include bash completion support Include the bash completion routines from the contrib/ directory in our core RPM, in the de facto standard location. Signed-off-by: Ian Ward Comfort <icomfort@stanford.edu> Acked-by: Ben Walton <bwalton@artsci.utoronto.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 March 2010, 16:40:06 UTC |
| 6a69551 | Junio C Hamano | 29 March 2010, 04:57:59 UTC | Update draft release notes to 1.7.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 March 2010, 04:57:59 UTC |
| 99f5b08 | Junio C Hamano | 29 March 2010, 04:52:28 UTC | Merge branch 'cc/cherry-pick-ff' * cc/cherry-pick-ff: revert: fix tiny memory leak in cherry-pick --ff rebase -i: use new --ff cherry-pick option Documentation: describe new cherry-pick --ff option cherry-pick: add tests for new --ff option revert: add --ff option to allow fast forward when cherry-picking builtin/merge: make checkout_fast_forward() non static parse-options: add parse_options_concat() to concat options | 29 March 2010, 04:52:28 UTC |
| 3b37d9c | Junio C Hamano | 29 March 2010, 04:52:28 UTC | Merge branch 'sb/notes-parse-opt' * sb/notes-parse-opt: notes: rework subcommands and parse options Conflicts: builtin/notes.c | 29 March 2010, 04:52:28 UTC |
| ff0a181 | Junio C Hamano | 29 March 2010, 04:52:18 UTC | Merge branch 'maint' * maint: Prepare for 1.7.0.4 Conflicts: RelNotes | 29 March 2010, 04:52:18 UTC |
| 0ae0840 | David Aguilar | 28 March 2010, 00:45:12 UTC | Makefile: Remove usage of deprecated Python "has_key" method "has_key" is a deprecated dictionary method in Python 2.6+. Simplify the sys.path manipulation for installed scripts by passing a default value to os.getenv() that takes a default value to be used when the environment variable is missing. SCRIPT_PYTHON is currently empty but this future-proofs us. It also fixes things for users who maintain local git forks with their own SCRIPT_PYTHON additions. Old code replaced the first element of sys.path[] which is typically '' (i.e. import library files relative to the script). It is safer to prepend the extra library path instead. Signed-off-by: David Aguilar <davvid@gmail.com> Acked-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 March 2010, 04:35:09 UTC |
| 0acb62f | Thomas Rast | 28 March 2010, 19:36:00 UTC | rebase -i: make post-rewrite work for 'edit' The post-rewrite support, in the form of the call to 'record_in_rewritten', was hidden in the arm where we have to record a new commit for the user. This meant that it was never invoked in the case where the user has already amended the commit by herself. [The test is designed to exercise both arms of the 'if' in question.] Furthermore, recording the stopped-sha (the SHA1 of the commit before the editing) suffered from a cut&paste error from die_with_patch and used the wrong variable, hence it never recorded anything. Noticed by Junio. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 March 2010, 04:34:40 UTC |
| e07665e | Junio C Hamano | 29 March 2010, 04:32:25 UTC | Prepare for 1.7.0.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 March 2010, 04:32:25 UTC |
| cc64c69 | Junio C Hamano | 29 March 2010, 04:21:42 UTC | Merge branch 'cp/add-u-pathspec' into maint * cp/add-u-pathspec: test for add with non-existent pathspec git add -u: die on unmatched pathspec | 29 March 2010, 04:21:42 UTC |
| faf7526 | Junio C Hamano | 29 March 2010, 00:42:58 UTC | Merge branch 'maint' * maint: t9350: fix careless use of "cd" difftool: Fix '--gui' when diff.guitool is unconfigured fast-export: don't segfault when marks file cannot be opened | 29 March 2010, 00:42:58 UTC |
| 4c367c6 | Junio C Hamano | 29 March 2010, 00:42:11 UTC | t9350: fix careless use of "cd" Upon failure of any of these tests (or when a test that is marked as expecting a failure is fixed), we will end up running later tests in random places. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 March 2010, 00:42:11 UTC |
| 42accae | David Aguilar | 27 March 2010, 21:58:09 UTC | difftool: Fix '--gui' when diff.guitool is unconfigured When diff.guitool is unconfigured and "--gui" is specified git-difftool dies with the following error message: config diff.guitool: command returned error: 1 Catch the error so that the "--gui" flag is a no-op when diff.guitool is unconfigured. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 March 2010, 16:29:12 UTC |
| bb6ad28 | Sverre Rabbelier | 28 March 2010, 05:42:48 UTC | fast-export: don't segfault when marks file cannot be opened The error function only prints an error message, resulting in a segfault if we later on try to fprintf to a NULL handle. Fix this by using die_errno instead. Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 March 2010, 16:26:16 UTC |
| 10439d8 | Chris Webb | 27 March 2010, 15:00:19 UTC | imap-send: suppress warning about cleartext password with CRAM-MD5 If a CRAM-MD5 challenge-response is used to authenticate to the IMAP server, git imap-send shouldn't warn about the password being sent in the clear. Signed-off-by: Chris Webb <chris@arachsys.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 March 2010, 16:24:25 UTC |
| 0ce142c | Michael J Gruber | 22 March 2010, 16:12:53 UTC | send-email: lazily assign editor variable b4479f0 (add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR", 2009-10-30) introduced the use of "git var GIT_EDITOR" to obtain the preferred editor program, instead of reading environment variables themselves. However, "git var GIT_EDITOR" run without a tty (think "cron job") would give a fatal error "Terminal is dumb, but EDITOR unset". This is not a problem for add-i, svn, p4 and callers of git_editor() defined in git-sh-setup, as all of these call it just before launching the editor. At that point, we know the caller wants to edit. But send-email ran this near the beginning of the program, even if it is not going to use any editor (e.g. run without --compose). Fix this by calling the command only when we edit a file. Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 March 2010, 10:07:31 UTC |
| 63e6715 | Stephen Boyd | 24 March 2010, 07:16:04 UTC | fmt-merge-msg: hide summary option The --summary command line option has been deprecated in favor of --log. Hide the option from the help message to further discourage the use of this option. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 March 2010, 02:45:31 UTC |
| fcb243f | Stephen Boyd | 24 March 2010, 07:16:03 UTC | fmt-merge-msg: remove custom string_list implementation This command uses a custom version of string list when it could just as easily use the string_list API. Convert it to use string_list and reduce the code size a bit. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 March 2010, 02:42:10 UTC |
| e242148 | Stephen Boyd | 24 March 2010, 07:16:02 UTC | string-list: add unsorted_string_list_lookup() Sometimes users need to lookup a string in an unsorted string_list. In that case they should use this function instead of the version for sorted strings. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 March 2010, 02:41:19 UTC |
| 15cb500 | Stephen Boyd | 24 March 2010, 07:16:01 UTC | fmt-merge-msg: use pretty.c routines This command duplicates functionality of the '%s' pretty format. Simplify the code a bit by using the pretty printing routine instead of open-coding it here. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 March 2010, 02:40:43 UTC |
| 6d6f6e6 | Stephen Boyd | 24 March 2010, 07:16:00 UTC | t6200: test fmt-merge-msg more Add some more tests so we don't break behavior upon modernizing fmt-merge-msg. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 March 2010, 02:40:27 UTC |
| 6183a6a | Stephen Boyd | 24 March 2010, 07:15:59 UTC | t6200: modernize with test_tick This test defines its own version of test_tick. Get rid of it. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 March 2010, 02:39:59 UTC |
| 419fe5b | Stephen Boyd | 24 March 2010, 07:15:58 UTC | fmt-merge-msg: be quiet if nothing to merge When FETCH_HEAD contains only 'not-for-merge' entries fmt-merge-msg still outputs "Merge" (and if the branch isn't master " into <branch>"). In this case fmt-merge-msg is outputting junk and should really just be quiet. Fix it. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 March 2010, 02:39:40 UTC |
| a757c64 | Junio C Hamano | 25 March 2010, 02:21:32 UTC | diff --check: honor conflict-marker-size attribute Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 March 2010, 02:35:34 UTC |
| 5e4f614 | Junio C Hamano | 24 March 2010, 23:55:37 UTC | Merge branch 'jh/maint-submodule-status-in-void' * jh/maint-submodule-status-in-void: git submodule summary: Handle HEAD as argument when on an unborn branch submodule summary: do not fail before the first commit | 24 March 2010, 23:55:37 UTC |
| a86ed83 | Junio C Hamano | 24 March 2010, 23:26:43 UTC | Merge branch 'tr/notes-display' * tr/notes-display: git-notes(1): add a section about the meaning of history notes: track whether notes_trees were changed at all notes: add shorthand --ref to override GIT_NOTES_REF commit --amend: copy notes to the new commit rebase: support automatic notes copying notes: implement helpers needed for note copying during rewrite notes: implement 'git notes copy --stdin' rebase -i: invoke post-rewrite hook rebase: invoke post-rewrite hook commit --amend: invoke post-rewrite hook Documentation: document post-rewrite hook Support showing notes from more than one notes tree test-lib: unset GIT_NOTES_REF to stop it from influencing tests Conflicts: git-am.sh refs.c | 24 March 2010, 23:26:43 UTC |
| b6a7a06 | Junio C Hamano | 24 March 2010, 23:25:43 UTC | Merge branch 'jl/submodule-diff-dirtiness' * jl/submodule-diff-dirtiness: git status: ignoring untracked files must apply to submodules too git status: Fix false positive "new commits" output for dirty submodules Refactor dirty submodule detection in diff-lib.c git status: Show detailed dirty status of submodules in long format git diff --submodule: Show detailed dirty status of submodules | 24 March 2010, 23:25:43 UTC |
| 797d443 | Junio C Hamano | 24 March 2010, 23:25:39 UTC | Merge branch 'pb/log-first-parent-p-m' * pb/log-first-parent-p-m: show --first-parent/-m: do not default to --cc show -c: show patch text revision: introduce setup_revision_opt t4013: add tests for log -p -m --first-parent git log -p -m: document -m and honor --first-parent | 24 March 2010, 23:25:39 UTC |
| 954f7cf | Junio C Hamano | 24 March 2010, 23:25:34 UTC | Merge branch 'jc/maint-refs-dangling' * jc/maint-refs-dangling: refs: ref entry with NULL sha1 is can be a dangling symref | 24 March 2010, 23:25:34 UTC |
| a5ee8fa | Junio C Hamano | 24 March 2010, 23:24:21 UTC | Merge branch 'maint' * maint: Documentation: explain the meaning of "-g" in git-describe output | 24 March 2010, 23:24:21 UTC |
| 0476228 | Junio C Hamano | 24 March 2010, 23:24:13 UTC | Merge branch 'jc/color-attrs' into maint * jc/color-attrs: color: allow multiple attributes | 24 March 2010, 23:24:13 UTC |
| bcbbe4f | Junio C Hamano | 24 March 2010, 23:24:03 UTC | Merge branch 'jk/maint-add-ignored-dir' into maint * jk/maint-add-ignored-dir: tests for "git add ignored-dir/file" without -f dir: fix COLLECT_IGNORED on excluded prefixes t0050: mark non-working test as such | 24 March 2010, 23:24:03 UTC |
| 7b676b1 | Junio C Hamano | 24 March 2010, 23:23:50 UTC | Merge branch 'bg/apply-fix-blank-at-eof' into maint * bg/apply-fix-blank-at-eof: t3417: Add test cases for "rebase --whitespace=fix" t4124: Add additional tests of --whitespace=fix apply: Allow blank context lines to match beyond EOF apply: Remove the quick rejection test apply: Don't unnecessarily update line lengths in the preimage | 24 March 2010, 23:23:50 UTC |
| b499549 | Marc Branchaud | 24 March 2010, 20:34:04 UTC | Teach rebase the --no-ff option. For git-rebase.sh, --no-ff is a synonym for --force-rebase. For git-rebase--interactive.sh, --no-ff cherry-picks all the commits in the rebased branch, instead of fast-forwarding over any unchanged commits. --no-ff offers an alternative way to deal with reverted merges. Instead of "reverting the revert" you can use "rebase --no-ff" to recreate the branch with entirely new commits (they're new because at the very least the committer time is different). This obviates the need to revert the reversion, as you can re-merge the new topic branch directly. Added an addendum to revert-a-faulty-merge.txt describing the situation and how to use --no-ff to handle it. Signed-off-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 March 2010, 21:42:57 UTC |
| 5856b5f | Shawn O. Pearce | 22 March 2010, 14:22:04 UTC | http-backend: Don't infinite loop during die() If stdout has already been closed by the CGI and die() gets called, the CGI will fail to write the "Status: 500 Internal Server Error" to the pipe, which results in die() being called again (via safe_write). This goes on in an infinite loop until the stack overflows and the process is killed by SIGSEGV. Instead set a flag on the first die() invocation and if we came back to the handler, just die silently, as it only means we failed to report the failure---we cannot report anything anyway in such a case. This way failures to write the error messages to the stdout pipe do not result in an infinite loop. We also now report on the death to stderr before we report to stdout, to increase the chances that the cause of the die() invocation will appear in the server's error log. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> fixup! http-backend.c: Don't infinite loop Now die_webcgi() actually can return during a recursive call into it, causing http-backend.c:554: error: 'noreturn' function does return The only reason we would come back to the die handler is because we failed during it, so we cannot report anything anyway. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 March 2010, 21:40:56 UTC |
| 44211e8 | R. Tyler Ballance | 21 March 2010, 19:01:50 UTC | Correct references to /usr/bin/python which does not exist on FreeBSD On FreeBSD, Python does not ship as part of the base system but is available via the ports system, which install the binary in /usr/local/bin. Signed-off-by: R. Tyler Ballance <tyler@monkeypox.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 March 2010, 21:33:54 UTC |
| 846b8f6 | Markus Heidelberg | 22 March 2010, 20:45:33 UTC | Documentation: explain the meaning of "-g" in git-describe output Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 March 2010, 18:31:45 UTC |
| 7337b13 | Michael J Gruber | 22 March 2010, 13:36:30 UTC | rev-list: use default abbrev length when abbrev-commit is in effect Currently, rev-list has a default of "0" for abbrev which means that switching on abbreviations with --abbrev-commit has no visible effect, even though the option is documented. Set abbrev to DEFAULT_ABBREV so that --abbrev-commit has the same effect as for log. Reported-by: Eli Barzilay <eli@barzilay.org> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 March 2010, 18:11:58 UTC |
| 4916c8f | Ramkumar Ramachandra | 22 March 2010, 18:07:52 UTC | imap-send: Remove limitation on message body There is a documented limitation on the body of any email not being able to contain lines starting with "From ". This patch removes that limitation by improving the parser to search for "From", "Date", and "Subject" fields in the email before considering it to be an email. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 March 2010, 18:00:25 UTC |
| 4503bd5 | Junio C Hamano | 22 March 2010, 00:01:55 UTC | Sync with Git 1.7.0.3 * maint: Git 1.7.0.3 .mailmap: Map the the first submissions of MJG by e-mail Documentation/git-clone: Transform description list into item list Documentation/urls: Remove spurious example markers Documentation/gitdiffcore: Remove misleading date in heading Documentation/git-reflog: Fix formatting of command lists | 22 March 2010, 00:03:57 UTC |
| 0b3dcfe | Junio C Hamano | 22 March 2010, 00:01:22 UTC | Git 1.7.0.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 March 2010, 00:01:22 UTC |
| d16a5da | Junio C Hamano | 22 March 2010, 00:00:22 UTC | Merge branch 'maint-1.6.6' into maint * maint-1.6.6: Documentation/git-clone: Transform description list into item list Documentation/urls: Remove spurious example markers Documentation/gitdiffcore: Remove misleading date in heading Documentation/git-reflog: Fix formatting of command lists | 22 March 2010, 00:00:22 UTC |
| 11f5498 | Michael J Gruber | 21 March 2010, 13:43:47 UTC | .mailmap: Map the the first submissions of MJG by e-mail so that git shortlog with '-e' coalesces all my commits. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2010, 23:30:17 UTC |
| 531e758 | Erik Faye-Lund | 20 March 2010, 18:55:28 UTC | ls: remove redundant logic find_unique_abbrev() already returns the full SHA-1 if abbrev = 0, so we can remove the logic that avoids the call. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2010, 23:23:44 UTC |
| 28a5317 | Erik Faye-Lund | 20 March 2010, 18:55:27 UTC | cherry: support --abbrev option Switch to parse-options API while we're at it. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2010, 23:23:40 UTC |
| 4763868 | Michael J Gruber | 21 March 2010, 17:30:19 UTC | Documentation/git-clone: Transform description list into item list so that the list of examples is formatted in the same way as for git-fetch, and, more importantly, the different identation for the code blocks in the examples (compared to the immediately preceding code blocks from url.txt) doesn't look like misformatted, but is clarified by the items' bullets. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2010, 21:45:05 UTC |
| a3cfb7f | Michael J Gruber | 21 March 2010, 17:30:18 UTC | Documentation/urls: Remove spurious example markers In urls.txt (which is included from git-{clone,fetch,push}.txt) several item lists are surrounded by example block markers. This is problematic for two reasons: - None of these lists are example lists, so they should not be marked as such semantically. - The html output looks weird (bulleted list with left sidebar). Therefore, remove the example block markers. Output by the man backend is unaffected. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2010, 21:42:24 UTC |
| dddfb3f | Michael J Gruber | 21 March 2010, 17:30:17 UTC | Documentation/gitdiffcore: Remove misleading date in heading Ever since the automatic conversion into man form, the heading contained a misidentified subheading reading "June 2005". Remove this since the documentation is more recent, and the correct date is in the footer. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2010, 21:40:18 UTC |
| b6c7c41 | Michael J Gruber | 21 March 2010, 17:30:16 UTC | Documentation/git-reflog: Fix formatting of command lists A misplaced list continuation mark appears literally in the rendered doc. Fix this by removing it. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2010, 21:40:02 UTC |
| 1fb5fdd | Erik Faye-Lund | 21 March 2010, 14:40:16 UTC | rev-list: fix --pretty=oneline with empty message 55246aa (Dont use "<unknown>" for placeholders and suppress printing of empty user formats) introduced a check to prevent empty user-formats from being printed. This test didn't take empty commit messages into account, and prevented the line-termination from being output. This lead to multiple commits on a single line. Correct it by guarding the check with a check for user-format. A similar correction for the --graph code-path has been included. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2010, 18:44:27 UTC |
| 7ca56aa | Jonathan Nieder | 21 March 2010, 00:52:21 UTC | merge-recursive: add a label for ancestor git merge-recursive (and hence git merge) will present conflict hunks in output something like what ‘diff3 -m’ produces if the merge.conflictstyle configuration option is set to diff3. There is a small difference from diff3: diff3 -m includes a label for the merge base on the ||||||| line. Tools familiar with the format and humans unfamiliar with the format both can benefit from such a label. So mark the start of the text from the merge bases with the heading "||||||| merged common ancestors". It would be nicer to use a more informative label. Perhaps someone will provide one some day. git rerere does not have trouble parsing the new output, and its preimage ids are unchanged since it has its own code for re-creating conflict hunks. No other code in git parses conflict hunks. Requested-by: Stefan Monnier <monnier@iro.umontreal.ca> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2010, 03:36:11 UTC |
| bf975d3 | Jonathan Nieder | 21 March 2010, 00:46:07 UTC | cherry-pick, revert: add a label for ancestor When writing conflict hunks in ‘diff3 -m’ format, also add a label to the common ancestor. Especially in a cherry-pick, it is not immediately obvious without such a label what the common ancestor represents. git rerere does not have trouble parsing the new output and its preimage ids are unchanged since it includes its own code for recreating conflict hunks. No other code in git parses conflict hunks. Requested-by: Stefan Monnier <monnier@iro.umontreal.ca> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2010, 03:36:11 UTC |
| d685654 | Jonathan Nieder | 21 March 2010, 00:45:21 UTC | revert: clarify label on conflict hunks When reverting a commit, the commit being merged is not the commit to revert itself but its parent. Add “parent of” to the conflict hunk label to make this more clear. The conflict hunk labels are all pieces of a single string written in the new get_message() function. Avoid some complication by using mempcpy to advance a pointer as the result is written. Also free the corresponding temporary buffer (it was leaked before). This is not important because it is a small one-time allocation. It would become a memory leak if unnoticed when libifying revert. This patch uses calls to strlen() instead of integer constants in some places. GCC will compute the length at compile time; I am not sure about other compilers, but this is not performance-critical anyway. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2010, 03:36:11 UTC |
