Commits

Author Commit Message Labels Comments Date
Johannes Sixt
t3404: begin "exchange commits with -p" test with correct preconditions The test case shows a bug in 'rebase -p', but even if the bug were fixed the test would fail because it did not ensure that the preconditions match the postconditions that were checked. Insert the suitable 'git checkout'. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Bobby Powers
diff --no-index: don't leak buffers in queue_diff queue_diff uses two strbufs, and at the end of the function strbuf_reset was called. This only reset the length of the buffer - any allocated memory was leaked. Using strbuf_release fixes this. Signed-off-by: Bobby Powers <bobbypowers@gmail.com> Reviewed-by: René Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Bobby Powers
diff --no-index: reset temporary buffer lengths on directory iteration Commit 875b91b (diff --no-index: use strbuf for temporary pathnames, 2012-04-25) introduced a regression when using diff --no-index with directories. When iterating through a directory, the switch to strbuf from heap-allocated char arrays caused paths to form like 'dir/file1', 'dir/file1file2', rather than 'dir/file1', 'dir/file2' as expected. Avoid this by resetting the paths variables to their…
Ralf Thielow
l10n: de.po: translate 3 new messages Translate 3 new messages for upcoming git 1.7.10.3. Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
Jiang Xin
l10n: zh_CN.po: translate 3 new messages Translate 3 new messages for upcoming git 1.7.10.3. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin
l10n: Update git.pot (3 new, 2 removed messages) Generate po/git.pot from v1.7.10.2-35-g0b9f4: * 3 new l10n messages at lines: 2743, 2751, 2759. * 2 removed l10n messages from lines: 1879, 2757. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Heiko Voigt
teach add_submodule_odb() to look for alternates Since we allow to link other object databases when loading a submodules database we should also load possible alternates. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint' of git://github.com/git-l10n/git-po into maint By Ralf Thielow (6) and others via Jiang Xin * 'maint' of git://github.com/git-l10n/git-po: l10n: zh_CN.po: translate 1 new message l10n: de.po: translate one new message l10n: de.po: unify translation of "ahead" and "behind" l10n: de.po: collection of improvements l10n: de.po: translate "remote" as "extern" l10n: de.po: translate "track" as "beobachten" l10n: add new members to Germ…
Junio C Hamano
Start preparing for 1.7.10.3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jk/maint-reflog-walk-count-vs-time' into maint Gives a better DWIM behaviour for --pretty=format:%gd, "stash list", and "log -g", depending on how the starting point ("master" vs "master@{0}" vs "master@{now}") and date formatting options (e.g. "--date=iso") are given on the command line. By Jeff King (4) and Junio C Hamano (1) * jk/maint-reflog-walk-count-vs-time: reflog-walk: tell explicit --date=default from not having --date at all re…
Junio C Hamano
Merge branch 'jk/doc-asciidoc-inline-literal' into maint By Jeff King * jk/doc-asciidoc-inline-literal: docs: stop using asciidoc no-inline-literal
Junio C Hamano
Merge branch 'ef/checkout-empty' into maint Running "git checkout" on an unborn branch used to corrupt HEAD (regression in 1.7.10); this makes it error out. By Erik Faye-Lund * ef/checkout-empty: checkout: do not corrupt HEAD on empty repo
Junio C Hamano
Merge branch 'jk/maint-tformat-with-z' into maint By Jan Krüger (1) and Junio C Hamano (1) * jk/maint-tformat-with-z: log-tree: the previous one is still not quite right log-tree: use custom line terminator in line termination mode
Junio C Hamano
Merge branch 'js/checkout-detach-count' into maint When checking out another commit from an already detached state, we used to report all commits that are not reachable from any of the refs as lossage, but some of them might be reachable from the new HEAD, and there is no need to warn about them. By Johannes Sixt * js/checkout-detach-count: checkout (detached): truncate list of orphaned commits at the new HEAD t2020-checkout-detach: check for…
Junio C Hamano
Merge branch 'ef/maint-clone-progress-fix' into maint Some time ago, "git clone" lost the progress output for its "checkout" phase; when run without any "--quiet" option, it should give progress to the lengthy operation. By Erik Faye-Lund * ef/maint-clone-progress-fix: clone: fix progress-regression
Heiko Voigt
link to gitmodules page at the beginning of git-submodule documentation This way the user does not have to scroll down to the bottom to find it. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Carlos Martín Nieto
pack-protocol: fix first-want separator in the examples When sending the "want" list, the capabilities list is separated from the obj-id by a SP instead of NUL as in the ref advertisement. The text is correct, but the examples wrongly show the separator as NUL. Fix the example so it uses SP. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jiang Xin
l10n: zh_CN.po: translate 1 new message Translate new message '[new ref]' since git 1.7.10.1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Junio C Hamano
Git 1.7.10.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.10.2
Junio C Hamano
Merge branch 'jc/diff-algo-cleanup' into maint * jc/diff-algo-cleanup: xdiff: PATIENCE/HISTOGRAM are not independent option bits xdiff: remove XDL_PATCH_* macros
Junio C Hamano
Merge branch 'ct/advise-push-default' into maint The cases "git push" fails due to non-ff can be broken into three categories; each case is given a separate advise message. By Christopher Tiwald (2) and Jeff King (1) * ct/advise-push-default: Fix httpd tests that broke when non-ff push advice changed clean up struct ref's nonfastforward field push: Provide situational hints for non-fast-forward errors
Junio C Hamano
Merge branch 'js/fast-import-test-9300' into maint By Johannes Sixt * js/fast-import-test-9300: t9300-fast-import: avoid 'exit' in test_expect_success snippets
Junio C Hamano
Merge branch 'jk/repack-no-explode-objects-from-old-pack' into maint "git repack" used to write out unreachable objects as loose objects when repacking, even if such loose objects will immediately pruned due to its age. By Jeff King * jk/repack-no-explode-objects-from-old-pack: gc: use argv-array for sub-commands argv-array: add a new "pushl" method argv-array: refactor empty_argv initialization gc: do not explode objects which will be immediately pruned
Junio C Hamano
Merge branch 'ah/maint-grep-double-init' into maint By Angus Hammond * ah/maint-grep-double-init: grep.c: remove redundant line of code
Junio C Hamano
Merge branch 'fa/maint-config-doc' into maint By Florian Achleitner * fa/maint-config-doc: Documentation/git-config: describe and clarify "--local <file>" option
Junio C Hamano
Merge branch 'rs/unpack-trees-leakfix' into maint By René Scharfe * rs/unpack-trees-leakfix: unpack-trees: plug minor memory leak unpack-trees: don't perform any index operation if we're not merging
Junio C Hamano
Merge branch 'sl/test-wc-l-line-count' into maint By Stefano Lattarini * sl/test-wc-l-line-count: tests: modernise style: more uses of test_line_count
Junio C Hamano
Merge branch 'rl/show-empty-prefix' into maint Unlike "git rev-parse --show-cdup", "--show-prefix" did not give an empty line when run at the top of the working tree. By Ross Lagerwall * rl/show-empty-prefix: rev-parse --show-prefix: add in trailing newline
Heiko Voigt
document submdule.$name.update=none option for gitmodules This option was not yet described in the gitmodules documentation. We only described it in the 'git submodule' command documentation but gitmodules is the more natural place to look. A short reference in the 'git submodule' documentation should be sufficient since the details can now be found in the documentation to gitmodules. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio …
Junio C Hamano
Update draft release notes to 1.7.10.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
  1. Prev
  2. Next