Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Git 1.6.5.6 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.6.5.6
Junio C Hamano
Fix archive format with -- on the command line Giving --format from the command line, or using output file extention to DWIM the output format, with a pathspec that is disambiguated with an explicit double-dash on the command line, e.g. git archive -o file --format=zip HEAD -- path git archive -o file.zip HEAD -- path didn't work correctly. This was because the code reordered (when one was given) or added (when the format was inferr…
Junio C Hamano
Remove post-upload-hook This hook runs after "git fetch" in the repository the objects are fetched from as the user who fetched, and has security implications. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'mm/maint-merge-ff-error-message-fix' into maint * mm/maint-merge-ff-error-message-fix: builtin-merge: show user-friendly error messages for fast-forward too. merge-recursive: make the error-message generation an extern function Conflicts: merge-recursive.c
Junio C Hamano
Merge branch 'jn/maint-pull-rebase-error-message' into maint * jn/maint-pull-rebase-error-message: pull: clarify advice for the unconfigured error case
Junio C Hamano
Merge branch 'jk/maint-add-p-delete-fix' into maint * jk/maint-add-p-delete-fix: add-interactive: fix deletion of non-empty files
Jeff King
add-interactive: fix deletion of non-empty files Commit 24ab81a fixed the deletion of empty files, but broke deletion of non-empty files. The approach it took was to factor out the "deleted" line from the patch header into its own hunk, the same way we do for mode changes. However, unlike mode changes, we only showed the special "delete this file" hunk if there were no other hunks. Otherwise, the user would annoyingly be presented with _two_ hun…
Junio C Hamano
Git 1.6.5.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.6.5.5
Linus Torvalds
Fix diff -B/--dirstat miscounting of newly added contents What used to happen is that diffcore_count_changes() simply ignored any hashes in the destination that didn't match hashes in the source. EXCEPT if the source hash didn't exist at all, in which case it would count _one_ destination hash that happened to have the "next" hash value. As a consequence, newly added material was often undercounted, making output from --dirstat and "complete rewrite" de…
Jeff King
reset: improve worktree safety valves The existing code checked to make sure we were not in a bare repository when doing a hard reset. However, we should take this one step further, and make sure we are in a worktree. Otherwise, we can end up munging files inside of '.git'. Furthermore, we should do the same check for --merge resets, which have the same properties. Actually, a merge reset of HEAD^ would already complain, since furthe…
Todd Zullinger
Documentation: Avoid use of xmlto --stringparam The --stringparam option is not available on older xmlto versions. Instead, set man.base.url.for.relative.links via a .xsl file. Older docbook versions will ignore this without causing grief to users of older xmlto versions. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe
archive: clarify description of path parameter Mention that path parameters are based on the current working directory. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> -- Documentation/git-archive.txt | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King
rerere: don't segfault on failure to open rr-cache The rr-cache directory should always exist if we are doing garbage collection (earlier code paths check this explicitly), but we may not necessarily succeed in opening it (for example, due to permissions problems). In that case, we should print an error message rather than simply segfaulting. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Prepare for 1.6.5.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'uk/maint-shortlog-encoding' into maint * uk/maint-shortlog-encoding: t4201: use ISO8859-1 rather than ISO-8859-1 shortlog: respect commit encoding
Junio C Hamano
Merge branch 'fc/maint-format-patch-pathspec-dashes' into maint * fc/maint-format-patch-pathspec-dashes: format-patch: add test for parsing of "--" format-patch: fix parsing of "--" on the command line
Junio C Hamano
Merge branch 'ap/maint-merge-strategy-list-fix' into maint * ap/maint-merge-strategy-list-fix: builtin-merge.c: call exclude_cmds() correctly.
Junio C Hamano
Merge branch 'jc/maint-am-keep' into maint * jc/maint-am-keep: Remove dead code from "git am"
Junio C Hamano
Merge branch 'rs/work-around-grep-opt-insanity' into maint * rs/work-around-grep-opt-insanity: Protect scripted Porcelains from GREP_OPTIONS insanity mergetool--lib: simplify guess_merge_tool()
Junio C Hamano
Merge branch 'rj/maint-cygwin-count-objects' into maint * rj/maint-cygwin-count-objects: git-count-objects: Fix a disk-space under-estimate on Cygwin
Junio C Hamano
Merge branch 'mm/maint-hint-failed-merge' into maint * mm/maint-hint-failed-merge: user-manual: Document that "git merge" doesn't like uncommited changes. merge-recursive: point the user to commit when file would be overwritten.
Junio C Hamano
Merge branch 'th/maint-remote-update-help-string' into maint * th/maint-remote-update-help-string: Update 'git remote update' usage string to match man page.
Junio C Hamano
Merge branch 'rj/maint-t9700' into maint * rj/maint-t9700: t9700-perl-git.sh: Fix a test failure on Cygwin
Junio C Hamano
Merge branch 'ls/maint-mailinfo-no-inbody' into maint * ls/maint-mailinfo-no-inbody: git am/mailinfo: Don't look at in-body headers when rebasing
Junio C Hamano
Merge branch 'mo/maint-crlf-doc' into maint * mo/maint-crlf-doc: core.autocrlf documentation: mention the crlf attribute
Junio C Hamano
Merge branch 'th/remote-usage' into maint * th/remote-usage: git remote: Separate usage strings for subcommands
Junio C Hamano
Merge branch 'pb/maint-use-custom-perl' into maint * pb/maint-use-custom-perl: Make sure $PERL_PATH is defined when the test suite is run.
Junio C Hamano
Merge branch 'mm/config-pathname-tilde-expand' into maint * mm/config-pathname-tilde-expand: Documentation: avoid xmlto input error expand_user_path: expand ~ to $HOME, not to the actual homedir. Expand ~ and ~user in core.excludesfile, commit.template
Junio C Hamano
Merge branch 'bc/grep-i-F' into maint * bc/grep-i-F: grep: Allow case insensitive search of fixed-strings
Junio C Hamano
Merge branch 'jk/maint-break-rename-reduce-memory' into maint * jk/maint-break-rename-reduce-memory: diffcore-rename: reduce memory footprint by freeing blob data early diffcore-break: save cnt_data for other phases diffcore-break: free filespec data as we go
  1. Prev
  2. Next