- 17 6月, 2014 11 次提交
-
-
由 Junio C Hamano 提交于
* as/pretty-truncate: pretty.c: format string with truncate respects logOutputEncoding t4205, t6006: add tests that fail with i18n.logOutputEncoding set t4205 (log-pretty-format): use `tformat` rather than `format` t4041, t4205, t6006, t7102: don't hardcode tested encoding value t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
-
由 Junio C Hamano 提交于
* jk/diff-follow-must-take-one-pathspec: move "--follow needs one pathspec" rule to diff_setup_done
-
由 Junio C Hamano 提交于
* sk/windows-unc-path: Windows: allow using UNC path for git repository
-
由 Junio C Hamano 提交于
* rr/rebase-autostash-fix: rebase -i: test "Nothing to do" case with autostash rebase -i: handle "Nothing to do" case with autostash
-
由 Junio C Hamano 提交于
* jk/report-fail-to-read-objects-better: open_sha1_file: report "most interesting" errno
-
由 Junio C Hamano 提交于
* jk/diff-files-assume-unchanged: run_diff_files: do not look at uninitialized stat data
-
由 Junio C Hamano 提交于
* jk/argv-array-for-child-process: argv-array: drop "detach" code get_importer: use run-command's internal argv_array get_exporter: use argv_array get_helper: use run-command's internal argv_array git_connect: use argv_array run_column_filter: use argv_array run-command: store an optional argv_array
-
由 Junio C Hamano 提交于
* sk/wincred: wincred: avoid overwriting configured variables wincred: add install target
-
由 Junio C Hamano 提交于
* jk/do-not-run-httpd-tests-as-root: t/lib-httpd: require SANITY prereq
-
由 Junio C Hamano 提交于
"git replace" learns a new "--edit" option. * cc/replace-edit: Documentation: replace: describe new --edit option replace: add --edit to usage string replace: add tests for --edit replace: die early if replace ref already exists replace: refactor checking ref validity replace: make sure --edit results in a different object replace: add --edit option replace: factor object resolution out of replace_object replace: use OPT_CMDMODE to handle modes replace: refactor command-mode determination
-
由 Junio C Hamano 提交于
* 'mt/patch-id-stable' (early part): patch-id-test: test stable and unstable behaviour patch-id: make it stable against hunk reordering test doc: test_write_lines does not split its arguments test: add test_write_lines helper
-
- 13 6月, 2014 3 次提交
-
-
由 Junio C Hamano 提交于
* maint: pull: do not abuse 'break' inside a shell 'case'
-
由 Junio C Hamano 提交于
* jc/rev-parse-argh-dashed-multi-words: update-index: fix segfault with missing --cacheinfo argument
-
由 Jacek Konieczny 提交于
It is not C. The code would break under mksh when 'pull.ff' is set: $ git pull /usr/lib/git-core/git-pull[67]: break: can't break Already up-to-date. Signed-off-by: NJacek Konieczny <jajcus@jajcus.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 11 6月, 2014 5 次提交
-
-
由 Cezary Zawadka 提交于
[efl: moved MinGW-specific part to compat/] [jes: fixed compilation on non-Windows] Eric Sunshine fixed mingw_offset_1st_component() to return consistently "foo" for UNC "//machine/share/foo", cf http://groups.google.com/group/msysgit/browse_thread/thread/c0af578549b5dda0 Author: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: NCezary Zawadka <czawadka@gmail.com> Signed-off-by: NEric Sunshine <sunshine@sunshineco.com> Signed-off-by: NErik Faye-Lund <kusmabite@gmail.com> Signed-off-by: NJohannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: NStepan Kasal <kasal@ucw.cz> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Michael S. Tsirkin 提交于
Verify that patch ID supports an algorithm that is stable against diff split and reordering. Signed-off-by: NMichael S. Tsirkin <mst@redhat.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Michael S. Tsirkin 提交于
Patch id changes if users reorder file diffs that make up a patch. As the result is functionally equivalent, a different patch id is surprising to many users. In particular, reordering files using diff -O is helpful to make patches more readable (e.g. API header diff before implementation diff). Add an option to change patch-id behaviour making it stable against these kinds of patch change: calculate SHA1 hash for each hunk separately and sum all hashes (using a symmetrical sum) to get patch id We use a 20byte sum and not xor - since xor would give 0 output for patches that have two identical diffs, which isn't all that unlikely (e.g. append the same line in two places). The new behaviour is enabled - when patchid.stable is true - when --stable flag is present Using a new flag --unstable or setting patchid.stable to false force the historical behaviour. In the documentation, clarify that patch ID can now be a sum of hashes, not a hash. Document how command line and config options affect the behaviour. Signed-off-by: NMichael S. Tsirkin <mst@redhat.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jonathan Nieder 提交于
test_write_lines carefully quotes its arguments as "$@", so test_write_lines "a b" c writes two lines as requested, not three. Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Michael S. Tsirkin 提交于
API and implementation as suggested by Junio. Signed-off-by: NMichael S. Tsirkin <mst@redhat.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 10 6月, 2014 8 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
"log --exclude=<glob> --all | shortlog" worked as expected, but "shortlog --exclude=<glob> --all" was not accepted at the command line argument parser level. * jc/shortlog-ref-exclude: shortlog: allow --exclude=<glob> to be passed
-
由 Junio C Hamano 提交于
Tools that read diagnostic output in our standard error stream do not want to see terminal control sequence (e.g. erase-to-eol). Detect them by checking if the standard error stream is connected to a tty. * mn/sideband-no-ansi: sideband.c: do not use ANSI control sequence on non-terminal
-
由 Junio C Hamano 提交于
Avoid running over the end of header string while parsing an incoming e-mail message to extract the patch. * rs/mailinfo-header-cmp: mailinfo: use strcmp() for string comparison
-
由 Junio C Hamano 提交于
Fix an error in parsing of .gitignore files that use a trailing "\ " to mark pathnames that end with a SP. * pb/trim-trailing-spaces: dir.c:trim_trailing_spaces(): fix for " \ " sequence
-
由 Junio C Hamano 提交于
The mode to run tests with HTTP server tests disabled was broken. * na/no-http-test-in-the-middle: t5538: move http push tests out to t5542
-
由 Junio C Hamano 提交于
"update-index --cacheinfo" in 2.0 crashes on a malformed command line. * jc/rev-parse-argh-dashed-multi-words: update-index: fix segfault with missing --cacheinfo argument
-
由 Junio C Hamano 提交于
A brown-paper-bag bugfix to a test that turned out to be a no-op by mistake. * lt/request-pull: fix brown paper bag breakage in t5150-request-pull.sh
-
- 07 6月, 2014 13 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* ss/howto-manage-trunk: How to keep a project's canonical history correct.
-
由 Junio C Hamano 提交于
* mc/git-p4-prepare-p4-only: git-p4: Do not include diff in spec file when just preparing p4
-
由 Junio C Hamano 提交于
* jn/test-lint-unmoor: test-lint: find unportable sed, echo, test, and export usage after &&
-
由 Junio C Hamano 提交于
* ep/shell-assign-and-export-vars: scripts: more "export VAR=VALUE" fixes scripts: "export VAR=VALUE" construct is not portable
-
由 Junio C Hamano 提交于
* jj/command-line-adjective: Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues
-
由 Junio C Hamano 提交于
* jc/coding-guidelines: CodingGuidelines: avoid "test <cond> -a/-o <cond>" CodingGuidelines: on splitting a long line CodingGuidelines: on comparison CodingGuidelines: do not call the conditional statement "if()" CodingGuidelines: give an example for shell function preamble CodingGuidelines: give an example for control statements CodingGuidelines: give an example for redirection CodingGuidelines: give an example for case/esac statement CodingGuidelines: once it is in, it is not worth the code churn
-
由 Junio C Hamano 提交于
* nd/status-auto-comment-char: commit: allow core.commentChar=auto for character auto selection config: be strict on core.commentChar
-
由 Junio C Hamano 提交于
* mt/rebase-i-keep-empty-test: rebase --keep-empty -i: add test
-
由 Junio C Hamano 提交于
* mk/show-s-no-extra-blank-line-for-merges: git-show: fix 'git show -s' to not add extra terminator after merge commit
-
由 Junio C Hamano 提交于
* sk/spawn-less-case-insensitively-from-grep-O-i: git grep -O -i: if the pager is 'less', pass the '-I' option
-
由 Junio C Hamano 提交于
* jd/subtree: contrib/subtree: allow adding an annotated tag contrib/subtree/Makefile: clean up rule for "clean" contrib/subtree/Makefile: clean up rules to generate documentation contrib/subtree/Makefile: s/libexecdir/gitexecdir/ contrib/subtree/Makefile: use GIT-VERSION-FILE contrib/subtree/Makefile: scrap unused $(gitdir)
-
由 Junio C Hamano 提交于
* wk/doc-clarify-upstream: Documentation: mention config sources for @{upstream}
-