Commits

Author Commit Message Labels Comments Date
Junio C Hamano
diff --shortstat: do not count "unmerged" entries Fix the same issue as the previous one for "git diff --stat"; unmerged entries was doubly-counted. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'nd/maint-compat-fnmatch-fix' into maint * nd/maint-compat-fnmatch-fix: compat/fnmatch: fix off-by-one character class's length check
Junio C Hamano
Merge branch 'jh/update-ref-d-through-symref' into maint * jh/update-ref-d-through-symref: Fix failure to delete a packed ref through a symref t1400-update-ref: Add test verifying bug with symrefs in delete_ref()
Junio C Hamano
Merge branch 'esr/maint-doc-fast-import' into maint * esr/maint-doc-fast-import: doc/fast-import: clarify how content states are built
Junio C Hamano
Merge branch 'wtk/submodule-doc-fixup' into maint * wtk/submodule-doc-fixup: git-submodule: wrap branch option with "<>" in usage strings.
Junio C Hamano
diff --stat: do not count "unmerged" entries Even though we show a separate *UNMERGED* entry in the patch and diffstat output (or in the --raw format, for that matter) in addition to and separately from the diff against the specified stage (defaulting to #2) for unmerged paths, they should not be counted in the total number of files affected---that would lead to counting the same path twice. The separation done by the previous step makes th…
Junio C Hamano
diff --stat: move the "total count" logic to the last loop The diffstat generation logic, with --stat-count limit, is implemented as three loops. - The first counts the width necessary to show stats up to specified number of entries, and notes up to how many entries in the data we need to iterate to show the graph; - The second iterates that many times to draw the graph, adjusts the number of "total modified files", and counts the total ad…
Junio C Hamano
diff --stat: use "file" temporary variable to refer to data->files[i] The generated code shouldn't change but it is easier to read. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
diff --stat: status of unmodified pair in diff-q is not zero It is spelled DIFF_STATUS_UNKNOWN these days, and is different from zero. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
test: add failing tests for "diff --stat" to t4049 There are a few problems in diff.c around --stat area, partially caused by the recent 74faaa1 (Fix "git diff --stat" for interesting - but empty - file changes, 2012-10-17), and largely caused by the earlier change that introduced when --stat-count was added. Add a few test pieces to t4049 to expose the issues. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Mark Szepieniec
Documentation: improve phrasing in git-push.txt The current version contains the sentence: Further suppose that the other person already pushed changes leading to A back to the original repository you two obtained the original commit X. which doesn't parse for me; I've changed it to Further suppose that the other person already pushed changes leading to A back to the original repository from which you two obtained the original commit X. Sig…
Antoine Pelisse
Fix typo in remote set-head usage parenthesis are not matching in `builtin_remote_sethead_usage` as a square bracket is closing something never opened. Signed-off-by: Antoine Pelisse <apelisse@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Paul Gortmaker
Makefile: hide stderr of curl-config test You will get $ make distclean 2>&1 | grep curl /bin/sh: curl-config: not found /bin/sh: curl-config: not found /bin/sh: curl-config: not found /bin/sh: curl-config: not found /bin/sh: curl-config: not found $ if you don't have a curl development package installed. The intent is not to alarm the user, but just to test if there is a new enough curl installed. However,…
Junio C Hamano
Git 1.8.0.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.8.0.1
Junio C Hamano
Merge branch 'jk/checkout-out-of-unborn' into maint * jk/checkout-out-of-unborn: checkout: print a message when switching unborn branches
Junio C Hamano
Merge branch 'cn/config-missing-path' into maint * cn/config-missing-path: config: don't segfault when given --path with a missing value
Junio C Hamano
Merge branch 'jk/maint-gitweb-xss' into maint Fixes an XSS vulnerability in gitweb. * jk/maint-gitweb-xss: gitweb: escape html in rss title
Marc Khouzam
Completion must sort before using uniq The user can be presented with invalid completion results when trying to complete a 'git checkout' command. This can happen when using a branch name prefix that matches multiple remote branches. For example, if available branches are: master remotes/GitHub/maint remotes/GitHub/master remotes/origin/maint remotes/origin/master When performing completion on 'git checkout ma' the user wi…
Nguyễn Thái Ngọc Duy
compat/fnmatch: fix off-by-one character class's length check Character class "xdigit" is the only one that hits 6 character limit defined by CHAR_CLASS_MAX_LENGTH. All other character classes are 5 character long and therefore never caught by this. This should make xdigit tests in t3070 pass on Windows. Reported-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Further preparation for 1.8.0.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'mg/maint-pull-suggest-upstream-to' into maint * mg/maint-pull-suggest-upstream-to: push/pull: adjust missing upstream help text to changed interface
Junio C Hamano
Merge branch 'mm/maint-doc-commit-edit' into maint * mm/maint-doc-commit-edit: Document 'git commit --no-edit' explicitly
Junio C Hamano
Merge branch 'as/maint-doc-fix-no-post-rewrite' into maint * as/maint-doc-fix-no-post-rewrite: commit: fixup misplacement of --no-post-rewrite description
Junio C Hamano
Merge branch 'rs/lock-correct-ref-during-delete' into maint * rs/lock-correct-ref-during-delete: refs: lock symref that is to be deleted, not its target
Junio C Hamano
Merge branch 'rf/maint-mailmap-off-by-one' into maint * rf/maint-mailmap-off-by-one: mailmap: avoid out-of-bounds memory access
Junio C Hamano
Merge branch 'jk/maint-diff-grep-textconv' into maint "git diff -G<pattern>" did not honor textconv filter when looking for changes. * jk/maint-diff-grep-textconv: diff_grep: use textconv buffers for add/deleted files
Junio C Hamano
Merge branch 'js/format-2047' into maint Various rfc2047 quoting issues around a non-ASCII name on the From: line in the output from format-patch have been corrected. * js/format-2047: format-patch tests: check quoting/encoding in To: and Cc: headers format-patch: fix rfc2047 address encoding with respect to rfc822 specials format-patch: make rfc2047 encoding more strict format-patch: introduce helper function last_line_length()…
Junio C Hamano
Start preparing for 1.8.0.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'sz/maint-curl-multi-timeout' into maint Sometimes curl_multi_timeout() function suggested a wrong timeout value when there is no file descriptors to wait on and the http transport ended up sleeping for minutes in select(2) system call. A workaround has been added for this. * sz/maint-curl-multi-timeout: Fix potential hang in https handshake
Junio C Hamano
Merge branch 'po/maint-refs-replace-docs' into maint The refs/replace hierarchy was not mentioned in the repository-layout docs. * po/maint-refs-replace-docs: Doc repository-layout: Show refs/replace
  1. Prev
  2. Next