summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-12-01path.c: make get_pathname() return strbuf instead of static bufferNguyễn Thái Ngọc Duy
We've been avoiding PATH_MAX whenever possible. This patch makes get_pathname() return a strbuf and updates the callers to take advantage of this. The code is simplified as we no longer need to worry about buffer overflow. vsnpath() behavior is changed slightly: previously it always clears the buffer before writing, now it just appends. Fortunately this is a static function and all of its callers prepare the buffer properly: git_path() gets the buffer from get_pathname() which resets the buffer, the remaining call sites start with STRBUF_INIT'd buffer. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-26Git 2.2v2.2.0Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-26RelNotes: spelling & grammar tweaksMarc Branchaud
Signed-off-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-21Git 2.2.0-rc3v2.2.0-rc3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-20l10n: remove a superfluous translation for push.cJiang Xin
Ralf reported that '--recurse-submodules' option in push.c should not be translated [1]. Before his commit is merged, remove superfluous translations for push.c. [1] http://www.spinics.net/lists/git/msg241964.html Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2014-11-20l10n: de.po: translate 2 messagesRalf Thielow
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-11-20l10n: de.po: translate 2 new messagesRalf Thielow
Signed-off-by: Phillip Sz <phillip.szelat@gmail.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-11-20l10n: batch updates for one trivial changeJiang Xin
In order to catch up with the release of Git 2.2.0 final, make a batch l10n update for the new l10n change brought by commit d52adf1 (trailer: display a trailer without its trailing newline). Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2014-11-20l10n: git.pot: v2.2.0 round 2 (1 updated)Jiang Xin
Generate po/git.pot from v2.2.0-rc2-23-gca0107e for git v2.2.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2014-11-19Merge branch 'sv/submitting-final-patch'Junio C Hamano
* sv/submitting-final-patch: SubmittingPatches: final submission is To: maintainer and CC: list
2014-11-19Merge branch 'sn/tutorial-status-output-example'Junio C Hamano
* sn/tutorial-status-output-example: gittutorial: fix output of 'git status'
2014-11-19Merge branch 'mh/doc-remote-helper-xref'Junio C Hamano
* mh/doc-remote-helper-xref: doc: add some crossrefs between manual pages
2014-11-19Merge branch 'tb/no-relative-file-url'Junio C Hamano
* tb/no-relative-file-url: t5705: the file:// URL should be absolute
2014-11-19Merge branch 'cc/interpret-trailers'Junio C Hamano
Small fixes to a new experimental command already in 'master'. * cc/interpret-trailers: trailer: display a trailer without its trailing newline trailer: ignore comment lines inside the trailers
2014-11-18Merge git://github.com/git-l10n/git-poJunio C Hamano
* 'master' of git://github.com/git-l10n/git-po: l10n: Update Catalan translation
2014-11-18Merge branch 'jc/doc-commit-only'Junio C Hamano
* jc/doc-commit-only: Documentation/git-commit: clarify that --only/--include records the working tree contents
2014-11-18Merge branch 'ta/tutorial-modernize'Junio C Hamano
* ta/tutorial-modernize: gittutorial.txt: remove reference to ancient Git version
2014-11-18Merge branch 'da/difftool'Junio C Hamano
Fix-up to a new feature in 'master'. * da/difftool: difftool: honor --trust-exit-code for builtin tools
2014-11-18l10n: Update Catalan translationAlex Henrie
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
2014-11-17Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano
* 'master' of git://github.com/git-l10n/git-po: l10n: de.po: translate 62 new messages l10n: de.po: Fixup one translation l10n: de.po: use imperative form for command options
2014-11-15l10n: de.po: translate 62 new messagesRalf Thielow
Translate 62 new messages came from git.pot update in 16742b0 (l10n: git.pot: proposed updates for v2.2.0 (+62)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-11-15l10n: de.po: Fixup one translationStefan Beller
English grammar with German words doesn't make it a German translation. ;) Signed-off-by: Stefan Beller <stefanbeller@gmail.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-11-14difftool: honor --trust-exit-code for builtin toolsDavid Aguilar
run_merge_tool() was not setting $status, which prevented the exit code for builtin tools from being forwarded to the caller. Capture the exit status and add a test to guarantee the behavior. Reported-by: Adria Farres <14farresa@gmail.com> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-14Git 2.2.0-rc2v2.2.0-rc2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-14l10n: de.po: use imperative form for command optionsRalf Thielow
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-11-13gittutorial: fix output of 'git status'Stefan Naewe
'git status' doesn't output leading '#'s these days. Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-13t5705: the file:// URL should be absoluteTorsten Bögershausen
The test misused a URL "file://." to mean "relative to here", which we no longer accept. In a file:// URL, typically there is no host, and RFC1738 says that file:///<path> should be used. Update t5705 to use a working URL. Reported-by: Michael Blume <blume.mike@gmail.com> Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-13SubmittingPatches: final submission is To: maintainer and CC: listSlavomir Vlcek
In an earlier part there is: "re-send it with "To:" set to the maintainer [*1*] and "cc:" the list [*2*]" for the final submission, but later we see "Send it to the list and cc the maintainer." Fix the later one to match the previous. Signed-off-by: Slavomir Vlcek <svlc@inventati.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-12Update draft release notes to 2.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-12Sync with 'maint'Junio C Hamano
2014-11-12Merge branch 'nd/gitignore-trailing-whitespace' into maintJunio C Hamano
* nd/gitignore-trailing-whitespace: gitignore.txt: fix spelling of "backslash"
2014-11-12Merge branch 'jk/fetch-reflog-df-conflict'Junio C Hamano
Fix-up a test for portability. * jk/fetch-reflog-df-conflict: t1410: fix breakage on case-insensitive filesystems
2014-11-11doc: add some crossrefs between manual pagesMax Horn
In particular, git-fast-import and -export link to each other, and gitremote-helpers links to existing remote helpers, and vice versa. Also link to fast-import from the remote helper spec, as this is relevant for remote helpers using the fast-import format. Signed-off-by: Max Horn <max@quendi.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-11gittutorial.txt: remove reference to ancient Git versionThomas Ackermann
Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-11Sync with maintJunio C Hamano
* maint:
2014-11-11Merge branch 'rs/clean-menu-item-defn' into maintJunio C Hamano
* rs/clean-menu-item-defn: clean: use f(void) instead of f() to declare a pointer to a function without arguments
2014-11-10run-command: use void to declare that functions take no parametersRené Scharfe
Explicitly declare that git_atexit_dispatch() and git_atexit_clear() take no parameters instead of leaving their parameter list empty and thus unspecified. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-10Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano
* 'master' of git://github.com/git-l10n/git-po: l10n: Updated Bulgarian translation of git (2296t,0f,0u) l10n: zh_CN: translations for git v2.2.0-rc0 l10n: sv.po: Update Swedish translation (2296t0f0u) l10n: fr.po (2296t) update for version 2.2.0 l10n: vi.po: Update new message strings l10n: git.pot: v2.2.0 round 1 (62 new, 23 removed)
2014-11-10Sync with maintJunio C Hamano
* maint: Documentation/config.txt: fix minor typo config.txt: fix typo
2014-11-10Merge branch 'js/diff-highlight-avoid-sigpipe'Junio C Hamano
* js/diff-highlight-avoid-sigpipe: diff-highlight: exit when a pipe is broken
2014-11-10Documentation/config.txt: fix minor typoThomas Quinot
Add a missing article at the beginning of a sentence, and rephrase slightly. Signed-off-by: Thomas Quinot <thomas@quinot.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-10config.txt: fix typoNicolas Dermine
Signed-off-by: Nicolas Dermine <nicolas.dermine@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-10trailer: use CHILD_PROCESS_INIT in apply_command()René Scharfe
Initialize the struct child_process variable cp at declaration time. This is shorter, saves a function call and prevents using the variable before initialization by mistake. Suggested-by: Jeff King <peff@peff.net> Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-10trailer: display a trailer without its trailing newlineChristian Couder
Trailers passed to the parse_trailer() function often have a trailing newline. When erroring out, we should display the invalid trailer properly, that means without any trailing newline. Helped-by: Junio C Hamano <gitster@pobox.com> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-10trailer: ignore comment lines inside the trailersChristian Couder
Otherwise trailers that are commented out might be processed. We would also error out if the comment line char is also a separator. This means that comments inside a trailer block will disappear, but that was already the case anyway. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-10t1410: fix breakage on case-insensitive filesystemsJeff King
Two tests recently added to t1410 create branches "a" and "a/b" to test d/f conflicts on reflogs. Earlier, unrelated tests in that script create the path "A/B" in the working tree. There's no conflict on a case-sensitive filesystem, but on a case-insensitive one, "git log" will complain that "a/b" is both a revision and a working tree path. We could fix this by using a "--" to disambiguate, but we are probably better off using names that are less confusing to make it more clear that they are unrelated to the working tree files. This patch turns "a/b" into "one/two". Reported-by: Michael Blume <blume.mike@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-07Git 2.2.0-rc1v2.2.0-rc1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-07Documentation/git-commit: clarify that --only/--include records the working ↵Junio C Hamano
tree contents With the original phrasing, it is possible to misunderstand as if the contents in the index for only the specified paths are made into the new commit. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-06Merge branch 'maint'Junio C Hamano
* maint: docs/credential-store: s/--store/--file/
2014-11-06Merge branch 'nd/gitignore-trailing-whitespace'Junio C Hamano
Documentation update. * nd/gitignore-trailing-whitespace: gitignore.txt: fix spelling of "backslash"
generated by cgit v0.10.2-6-g49f6 at 2024-05-09 10:30:26 (GMT)