summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-06-03submodule: additional regression tests for relative URLsLibravatar Jon Seymour1-3/+107
Some additional tests are added to support regression testing of the changes in the remainder of the series. We also add a pristine copy of .gitmodules in anticipation of this being required by later tests. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-05-17Merge git://github.com/git-l10n/git-poLibravatar Junio C Hamano4-941/+2332
By Jiang Xin (3) and others via Jiang Xin (3) and Ralf Thielow (1) * git://github.com/git-l10n/git-po: l10n: de.po: translate 3 new messages l10n: zh_CN.po: translate 3 new messages l10n: pt_PT.po translate new messages l10n: Update git.pot (8 new, 4 removed messages) l10n: Update git.pot (3 new, 2 removed messages)
2012-05-17Merge branch 'nd/i18n-parseopt'Libravatar Junio C Hamano3-50/+56
Text from "git cmd --help" are getting prepared for i18n. By Nguyễn Thái Ngọc Duy * nd/i18n-parseopt: i18n: apply: mark parseopt strings for translation i18n: parseopt: lookup help and argument translations when showing usage
2012-05-17Merge branch 'rs/xdiff-lose-emit-func'Libravatar Junio C Hamano7-119/+51
Simplifies the interface between the implementation of "blame" and underlying xdiff engine, and removes a lot of unused or unnecessary code from the latter. By René Scharfe (6) and Ramsay Jones (1) * rs/xdiff-lose-emit-func: builtin/blame.c: Fix a "Using plain integer as NULL pointer" warning xdiff: remove unused functions xdiff: remove emit_func() and xdi_diff_hunks() blame: factor out helper for calling xdi_diff() blame: use hunk_func(), part 2 blame: use hunk_func(), part 1 xdiff: add hunk_func()
2012-05-17Merge branch 'fc/git-complete-helper'Libravatar Junio C Hamano2-38/+34
By Felipe Contreras * fc/git-complete-helper: completion: add new __git_complete helper
2012-05-17Merge branch 'ld/git-p4-tags-and-labels'Libravatar Junio C Hamano2-3/+23
By Luke Diamand * ld/git-p4-tags-and-labels: git p4: fix bug when enabling tag import/export via config variables git p4: fix bug when verbose enabled with tag export git p4: add test for tag import/export enabled via config
2012-05-17git-svn: clarify the referent of dcommit's optional argumentLibravatar Jon Seymour1-20/+19
The documentation of the dcommit subcommand is reworded to clarify that the optional argument refers to a git branch, not an SVN branch. The discussion of the optional argument is put into its own paragraph as is the guidance about using 'dcommit' in preference to 'set-tree'. The section on REBASE vs. PULL/MERGE is reworded to incorporate the advice to prefer 'git rebase' previously in the description of 'dcommit'. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net>
2012-05-16git-svn: support rebase --preserve-mergesLibravatar Avishay Lavie2-1/+5
When git svn rebase is performed after an unpushed merge, the rebase operation follows both parents and replays both the user's local commits and those from the merged branch. This is usually not the intended behavior. This patch adds support for the --preserve-merges/-p flag which allows for a better workflow by re-applying merge commits as merges. [ew: fixed a minor syntax error] Signed-off-by: Avishay Lavie <avishay.lavie@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net>
2012-05-16Merge branch 'maint' into masterLibravatar Jiang Xin2-130/+116
By Ralf Thielow(1) and Jiang Xin(1) * maint: l10n: de.po: translate 3 new messages l10n: zh_CN.po: translate 3 new messages
2012-05-15l10n: de.po: translate 3 new messagesLibravatar Ralf Thielow1-101/+127
Translate 3 new messages for upcoming git 1.7.10.3. Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-15l10n: zh_CN.po: translate 3 new messagesLibravatar Jiang Xin1-99/+121
Translate 3 new messages for upcoming git 1.7.10.3. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-15Merge branch 'master' of git://github.com/marcomsousa/git-l10n-pt_PTLibravatar Jiang Xin1-585/+1970
By Marco Sousa * marcomsousa/git-l10n-pt_PT/master: l10n: pt_PT.po translate new messages
2012-05-15l10n: pt_PT.po translate new messagesLibravatar Marco Sousa1-585/+1970
Translate new and old messages came from git.pot. Signed-off-by: Marco Sousa <marcomsousa@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-15l10n: Update git.pot (8 new, 4 removed messages)Libravatar Jiang Xin1-226/+246
Generate po/git.pot from v1.7.10.2-520-g6a4a48: * 8 new l10n messages at lines: 977, 982, 1404, 1409, 1414, 1419, 1424, 1429. * 4 removed l10n messages from lines: 977, 1399, 1404, 1409. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-15Merge branch 'maint'Libravatar Jiang Xin0-0/+0
* maint: l10n: Update git.pot (3 new, 2 removed messages)
2012-05-15l10n: Update git.pot (3 new, 2 removed messages)Libravatar Jiang Xin1-96/+108
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>
2012-05-14Update draft release notes for 12th batchLibravatar Junio C Hamano1-24/+4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-05-14Merge branch 'fc/simplify-complete-revlist-file'Libravatar Junio C Hamano1-4/+2
By Felipe Contreras * fc/simplify-complete-revlist-file: completion: simplify __git_complete_revlist_file
2012-05-14Merge branch 'nd/threaded-index-pack'Libravatar Junio C Hamano5-67/+331
Enables threading in index-pack to resolve base data in parallel. By Nguyễn Thái Ngọc Duy (3) and Ramsay Jones (1) * nd/threaded-index-pack: index-pack: disable threading if NO_PREAD is defined index-pack: support multithreaded delta resolving index-pack: restructure pack processing into three main functions compat/win32/pthread.h: Add an pthread_key_delete() implementation
2012-05-14Sync with maintLibravatar Junio C Hamano3-5/+31
2012-05-14Merge branch 'master' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano3-528/+1843
By Ralf Thielow (6) and others via Jiang Xin (3) and Ralf Thielow (1) * 'master' 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 German translation team l10n: de.po: collection of suggestions l10n: de.po: translate "bad" as "ungültig" ("invalid") l10n: de.po: hopefully uncontroversial fixes l10n: de.po: translate "bare" as "bloß" l10n: Update git.pot (275 new, 15 removed messages) l10n: Update git.pot (1 new messages)
2012-05-14Merge branch 'maint' of git://github.com/git-l10n/git-po into maintLibravatar Junio C Hamano4-515/+538
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 German translation team l10n: de.po: collection of suggestions l10n: de.po: translate "bad" as "ungültig" ("invalid") l10n: de.po: hopefully uncontroversial fixes l10n: de.po: translate "bare" as "bloß" l10n: Update git.pot (1 new messages)
2012-05-14Start preparing for 1.7.10.3Libravatar Junio C Hamano2-1/+27
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-05-14Merge branch 'jk/maint-reflog-walk-count-vs-time' into maintLibravatar Junio C Hamano7-16/+82
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 reflog-walk: always make HEAD@{0} show indexed selectors reflog-walk: clean up "flag" field of commit_reflog struct log: respect date_mode_explicit with --format:%gd t1411: add more selector index/date tests
2012-05-14Merge branch 'jk/doc-asciidoc-inline-literal' into maintLibravatar Junio C Hamano53-194/+192
By Jeff King * jk/doc-asciidoc-inline-literal: docs: stop using asciidoc no-inline-literal
2012-05-14Merge branch 'ef/checkout-empty' into maintLibravatar Junio C Hamano2-1/+12
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
2012-05-14Merge branch 'jk/maint-tformat-with-z' into maintLibravatar Junio C Hamano2-1/+29
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
2012-05-14Merge branch 'js/checkout-detach-count' into maintLibravatar Junio C Hamano2-11/+23
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 the number of orphaned commits
2012-05-14Merge branch 'ef/maint-clone-progress-fix' into maintLibravatar Junio C Hamano1-1/+1
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
2012-05-14link to gitmodules page at the beginning of git-submodule documentationLibravatar Heiko Voigt1-3/+3
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>
2012-05-14completion: add new __git_complete helperLibravatar Felipe Contreras2-38/+34
This simplifies the completions, and would make it easier to define aliases in the future. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-05-14builtin/blame.c: Fix a "Using plain integer as NULL pointer" warningLibravatar Ramsay Jones1-1/+1
Plain gcc may not but sparse catches and complains about this sort of stuff. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-05-14pack-protocol: fix first-want separator in the examplesLibravatar Carlos Martín Nieto1-2/+2
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>
2012-05-12Merge branch 'maint'Libravatar Jiang Xin0-0/+0
* maint: l10n: zh_CN.po: translate 1 new message Conflicts: po/zh_CN.po Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-12l10n: zh_CN.po: translate 1 new messageLibravatar Jiang Xin1-94/+98
Translate new message '[new ref]' since git 1.7.10.1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-11git p4: fix bug when enabling tag import/export via config variablesLibravatar Luke Diamand1-2/+2
Use Python's True, not true. Causes failure when enabling tag import or export in "git p4" using a config option rather than the command line. Signed-off-by: Luke Diamand <luke@diamand.org> Acked-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-05-11git p4: fix bug when verbose enabled with tag exportLibravatar Luke Diamand1-1/+1
Wrong variable name used when verbose enabled, causes failure. Signed-off-by: Luke Diamand <luke@diamand.org> Acked-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-05-11git p4: add test for tag import/export enabled via configLibravatar Luke Diamand1-0/+20
This adds a test for git p4 to check it can import/export tags when enabled via a config variable rather than on the command line. Signed-off-by: Luke Diamand <luke@diamand.org> Acked-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-05-11Update draft release notes to 1.7.11 (11th batch)Libravatar Junio C Hamano1-13/+8
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-05-11Merge branch 'ef/checkout-empty'Libravatar Junio C Hamano2-1/+12
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
2012-05-11Merge branch 'jk/maint-reflog-walk-count-vs-time'Libravatar Junio C Hamano7-16/+82
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 reflog-walk: always make HEAD@{0} show indexed selectors reflog-walk: clean up "flag" field of commit_reflog struct log: respect date_mode_explicit with --format:%gd t1411: add more selector index/date tests
2012-05-11Merge branch 'nd/i18n-branch-lego'Libravatar Junio C Hamano1-9/+23
Fix yet another message construction by concatenating pieces of sentenes, which is unfriendly to i18n. By Nguyễn Thái Ngọc Duy * nd/i18n-branch-lego: branch: remove lego in i18n tracking info strings
2012-05-11Sync with 1.7.10.2Libravatar Junio C Hamano4-7/+22
2012-05-11Git 1.7.10.2Libravatar Junio C Hamano3-2/+17
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-05-11Merge branch 'jc/diff-algo-cleanup' into maintLibravatar Junio C Hamano8-25/+24
* jc/diff-algo-cleanup: xdiff: PATIENCE/HISTOGRAM are not independent option bits xdiff: remove XDL_PATCH_* macros
2012-05-11Merge branch 'ct/advise-push-default' into maintLibravatar Junio C Hamano10-13/+99
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
2012-05-11Merge branch 'js/fast-import-test-9300' into maintLibravatar Junio C Hamano1-34/+54
By Johannes Sixt * js/fast-import-test-9300: t9300-fast-import: avoid 'exit' in test_expect_success snippets
2012-05-11Merge branch 'jk/repack-no-explode-objects-from-old-pack' into maintLibravatar Junio C Hamano7-53/+107
"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
2012-05-11Merge branch 'ah/maint-grep-double-init' into maintLibravatar Junio C Hamano1-1/+1
By Angus Hammond * ah/maint-grep-double-init: grep.c: remove redundant line of code
2012-05-11Merge branch 'fa/maint-config-doc' into maintLibravatar Junio C Hamano1-5/+9
By Florian Achleitner * fa/maint-config-doc: Documentation/git-config: describe and clarify "--local <file>" option
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 09:04:02 +0000