Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Git 1.7.4.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.4.2
Jakub Narębski
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 tim…
SZEDER Gábor
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 orig…
Jeff King
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 de…
Junio C Hamano
Update draft release notes to 1.7.4.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
Merge branch 'mo/perl-bidi-pipe-envfix' into maint * mo/perl-bidi-pipe-envfix: perl: command_bidi_pipe() method should set-up git environmens
Junio C Hamano
Merge branch 'ae/better-template-failure-report' into maint * ae/better-template-failure-report: Improve error messages when temporary file creation fails
Ben Walton
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 d…
Carlos Martín Nieto
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>
Jakub Narębski
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>
Junio C Hamano
bisect: explain the rationale behind 125 Signed-off-by: Junio C Hamano <gitster@pobox.com>
megajoule
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>
Junio C Hamano
Prepare draft release notes to 1.7.4.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jn/maint-commit-missing-template' into maint * jn/maint-commit-missing-template: commit: error out for missing commit message template
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
Merge branch 'mg/maint-difftool-vim-readonly' into maint * mg/maint-difftool-vim-readonly: mergetool-lib: call vim in readonly mode for diffs
Junio C Hamano
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
Junio C Hamano
Merge branch 'jk/fail-null-clone' into maint * jk/fail-null-clone: clone: die when trying to clone missing local path
Junio C Hamano
Merge branch 'jh/push-default-upstream-configname' into maint * jh/push-default-upstream-configname: push.default: Rename 'tracking' to 'upstream'
Junio C Hamano
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
Junio C Hamano
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
Junio C Hamano
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
Kevin Cernekee
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"> …
Carlos Martín Nieto
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>
Carlos Martín Nieto
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 aff…
Jonathan Nieder
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 betw…
  1. Prev
  2. Next