Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Merge branch 'mg/doc-rev-parse-treepath-syntax' into maint * mg/doc-rev-parse-treepath-syntax: git-rev-parse.txt: Add more examples for caret and colon git-rev-parse.txt: Document ":path" specifier
Junio C Hamano
Merge branch 'tr/receive-pack-aliased-update-fix' into maint * tr/receive-pack-aliased-update-fix: check_aliased_update: strcpy() instead of strcat() to copy receive-pack: detect aliased updates which can occur with symrefs receive-pack: switch global variable 'commands' to a parameter Conflicts: t/t5516-fetch-push.sh
Pierre Habouzit
fix git branch -m in presence of cross devices When you have for example a bare repository stored on NFS, and that you create new workdirs locally (using contrib's git-new-workdir), logs/refs is a symlink to a different device. Hence when the reflogs are renamed, all must happen below logs/refs or one gets cross device rename errors like: git branch -m foo error: unable to move logfile logs/refs/heads/master to tmp-renamed-log: Invalid cr…
Heiko Voigt
add missing && to submodule-merge testcase Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King
test-date: fix sscanf type conversion Reading into a time_t isn't portable, since we don't know the exact type. Instead, use an unsigned long, which is what show_date wants, anyway. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Dylan Reid
xdiff: optimise for no whitespace difference when ignoring whitespace. In xdl_recmatch, do the memcmp to check if the two lines are equal before checking if whitespace flags are set. If the lines are identical, then there is no need to check if they differ only in whitespace. This makes the common case (there is no whitespace difference) faster. It costs the case where lines are the same length and contain whitespace differences, but the common case is more than 20%…
Jeff King
t0006: test timezone parsing Previously, test-date simply ignored the parsed timezone and told show_date() to use UTC. Instead, let's print out what we actually parsed. While we're at it, let's make it easy for tests to work in a specific timezone. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber
rerere.txt: Document forget subcommand dea4562 (rerere forget path: forget recorded resolution, 2009-12-25) introduced the forget subcommand for rerere. Document it. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Chris Packham
Documentation/git-gc.txt: add reference to githooks This advertises the existence of the 'pre-auto-gc' hook and adds a cross reference to where the hook is documented. Signed-off-by: Chris Packham <judge.packham@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.7.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.1.1
Brandon Casey
t/t9001: use egrep when regular expressions are involved Supplying backslashed, extended regular expressions to grep is not portable. Use egrep instead. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber
git-rev-parse.txt: Add more examples for caret and colon Several items in the caret, colon and friends section contain examples already. Make sure they all come with examples, and that examples come early so that they serve as a visual guide, as well. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Update draft release notes to 1.7.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'tr/send-email-8bit' into maint * tr/send-email-8bit: send-email: ask about and declare 8bit mails
Junio C Hamano
Merge branch 'pb/maint-perl-errmsg-no-dir' into maint * pb/maint-perl-errmsg-no-dir: Git.pm: better error message
Junio C Hamano
Merge branch 'js/maint-am-rebase-invalid-author' into maint * js/maint-am-rebase-invalid-author: am: use get_author_ident_from_commit instead of mailinfo when rebasing
Junio C Hamano
Merge branch 'jc/maint-simpler-common-prefix' into maint * jc/maint-simpler-common-prefix: common_prefix: simplify and fix scanning for prefixes
Junio C Hamano
Merge branch 'bd/maint-unpack-trees-parawalk-fix' into maint * bd/maint-unpack-trees-parawalk-fix: unpack-trees: Make index lookahead less pessimal
Ramsay Jones
notes: Initialise variable to appease gcc gcc version 3.4.4 thinks that the 'cmp' variable could be used while uninitialised and complains thus: notes.c: In function `write_each_non_note_until': notes.c:719: warning: 'cmp' might be used uninitialized in \ this function Note that gcc versions 4.1.2 and 4.4.0 do not issue this warning. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano …
Jeff King
notes: check number of parameters to "git notes copy" Otherwise we may segfault with too few parameters. Signed-off-by: Jeff King <peff@peff.net> Tested-by: Bert Wesarg <Bert.Wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber
git-rev-parse.txt: Document ":path" specifier The empty treeish in ":path" means "index". This is actually a special case of the ":stage:path" syntax where it is documented, but mentioning it also together with "treeish:path" is helpful, so do it. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramsay Jones
msvc: Fix some compiler warnings In particular, using the normal (or production) compiler warning level (-W3), msvc complains as follows: .../sha1.c(244) : warning C4018: '<' : signed/unsigned mismatch .../sha1.c(270) : warning C4244: 'function' : conversion from \ 'unsigned __int64' to 'unsigned long', possible loss of data .../sha1.c(271) : warning C4244: 'function' : conversion from \ 'unsigned __int64' to 'unsigned lon…
Christian Couder
Documentation: grep: fix asciidoc problem with -- Asciidoc interprets two dashes separated by spaces as a single big dash. So let's escape the first dash, so that "\--" will properly appear as "--". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramsay Jones
msvc: Fix some "expr evaluates to function" compiler warnings In particular, the following warning is issued while compiling notes.c: notes.c(927) : warning C4550: expression evaluates to a \ function which is missing an argument list along with identical warnings on lines 928, 1016 and 1017. In order to suppress the warning, we change the definition of combine_notes_fn, so that the symbol type is an (explicit) "pointer to function ...". As a result,…
Junio C Hamano
Update draft release notes to 1.7.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'ic/maint-rebase-i-abort' into maint * ic/maint-rebase-i-abort: rebase -i: Abort cleanly if new base cannot be checked out
Junio C Hamano
Merge branch 'cc/maint-commit-reflog-msg' into maint * cc/maint-commit-reflog-msg: commit: use value of GIT_REFLOG_ACTION env variable as reflog message
Junio C Hamano
Merge branch 'jk/maint-advice-empty-amend' into maint * jk/maint-advice-empty-amend: commit: give advice on empty amend
Junio C Hamano
Merge branch 'tc/commit-abbrev-fix' into maint * tc/commit-abbrev-fix: commit::print_summary(): don't use format_commit_message() t7502-commit: add summary output tests for empty and merge commits t7502-commit: add tests for summary output
Junio C Hamano
Merge branch 'jn/document-rebase-i-p-limitation' into maint * jn/document-rebase-i-p-limitation: rebase -i -p: document shortcomings
  1. Prev
  2. Next