summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-05-23Merge branch 'rs/archive-tree-in-tip-simplify'Libravatar Junio C Hamano2-14/+7
By René Scharfe * rs/archive-tree-in-tip-simplify: archive-tar: keep const in checksum calculation archive: simplify refname handling
2012-05-23Merge branch 'js/rev-parse-doc-fix'Libravatar Junio C Hamano1-1/+2
By Jon Seymour * js/rev-parse-doc-fix: rev-parse doc: --git-dir does not always show a relative path
2012-05-23Merge branch 'js/rebase-i-p-test-fix'Libravatar Junio C Hamano1-0/+1
By Johannes Sixt * js/rebase-i-p-test-fix: Fix t3411.3 to actually rebase something
2012-05-23Merge branch 'bp/diff-no-index-strbuf-fix'Libravatar Junio C Hamano2-2/+27
Fix regressions to "git diff --no-index" when it recurses down. By Bobby Powers * bp/diff-no-index-strbuf-fix: diff --no-index: don't leak buffers in queue_diff diff --no-index: reset temporary buffer lengths on directory iteration
2012-05-23Merge branch 'hv/submodule-alt-odb'Libravatar Junio C Hamano4-2/+39
When peeking into object stores of submodules, the code forgot that they might borrow objects from alternate object stores on their own. By Heiko Voigt * hv/submodule-alt-odb: teach add_submodule_odb() to look for alternates
2012-05-20remote: fix typoLibravatar Ralf Thielow1-1/+1
The mapping that describe what ref fetched from the remote is used to update what ref locally is called "refspec", not "respec". Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-05-20Merge branch 'maint'Libravatar Junio C Hamano4-4/+5
By Jens Lehmann (1) and Johannes Sixt (1) * maint: Consistently use "superproject" instead of "supermodule" t3404: begin "exchange commits with -p" test with correct preconditions
2012-05-20Consistently use "superproject" instead of "supermodule"Libravatar Jens Lehmann3-4/+4
We fairly consistently say "superproject" and never "supermodule" these days. But there are seven occurrences of "supermodule" left in the current work tree. Three appear in Release Notes for 1.5.3 and 1.7.7, three in test names and one in a C-code comment. Replace all occurrences of "supermodule" outside of the Release Notes (which shouldn't be changed after the fact) with "superproject" for consistency. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-05-20t3404: begin "exchange commits with -p" test with correct preconditionsLibravatar Johannes Sixt1-0/+1
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>
2012-05-18Fix t3411.3 to actually rebase somethingLibravatar Johannes Sixt1-0/+1
The test intends to rebase a branchy history onto a later commit, but it forgot to reset HEAD back to an earlier commit before it set up the side branches. In the end, every "rebased" commit was only a fast-forward and the 'rebase -p' did not change the commit graph at all. Insert the missing checkout that moves to an earlier commit. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-05-18rev-parse doc: --git-dir does not always show a relative pathLibravatar Jon Seymour1-1/+2
The description was misleading because it lead the reader to believe that --git-dir would always show a relative path when, in fact, the actual behaviour does not guarantee this. Rather, it was intended that the advice be given that if a relative path is shown, then the path is relative to the current working directory and not some other directory (for example, the root of the working tree). Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-05-18archive-tar: keep const in checksum calculationLibravatar René Scharfe1-2/+2
For correctness, don't needlessly drop the const qualifier when casting. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-05-18archive: simplify refname handlingLibravatar René Scharfe1-12/+5
There is no need to build a copy of the relevant part of the string just to make sure we have a NUL-terminated string. We can simply pass the length of the interesting part to dwim_ref() instead. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> 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-16diff --no-index: don't leak buffers in queue_diffLibravatar Bobby Powers1-2/+2
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>
2012-05-16diff --no-index: reset temporary buffer lengths on directory iterationLibravatar Bobby Powers2-0/+25
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 original length before each iteration. 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>
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-14teach add_submodule_odb() to look for alternatesLibravatar Heiko Voigt4-2/+39
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>
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>
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-12 14:17:36 +0000