- 18 3月, 2010 1 次提交
-
-
由 Ian Ward Comfort 提交于
We already complete HEAD, of course, and might as well complete the other common refs mentioned in the rev-parse man page: FETCH_HEAD, ORIG_HEAD, and MERGE_HEAD. Signed-off-by: NIan Ward Comfort <icomfort@stanford.edu> Acked-by: NShawn O. Pearce <spearce@spearce.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 16 3月, 2010 2 次提交
-
-
由 Michael J Gruber 提交于
Clarify the description of the 2-tree merge by defining the terms which are used in the table, and by applying some small linguistic changes. Signed-off-by: NMichael J Gruber <git@drmicha.warpmail.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Michael J Gruber 提交于
Asciidoc takes the first non-space character in the first line of the paragraph as a reference point for preformatted layout, so adjust to that to make the table align. Signed-off-by: NMichael J Gruber <git@drmicha.warpmail.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 14 3月, 2010 4 次提交
-
-
由 Dave Olszewski 提交于
If a revision is specified, it happens not to have any commits, don't use the default revision. By doing so, surprising and undesired behavior can happen, such as showing the reflog for HEAD when a branch was specified. [jc: squashed a test from René] Signed-off-by: NDave Olszewski <cxreg@pobox.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 René Scharfe 提交于
As Vladimir reported, "git log -g refs/stash" surprisingly showed the reflog of HEAD if the message in the reflog file was too long. To fix this, convert for_each_recent_reflog_ent() to use strbuf_getwholeline() instead of fgets(), for safety and to avoid any size limits for reflog entries. Also reverse the logic of the part of the function that only looks at file tails. It used to close the file if fgets() succeeded. The following fgets() call in the while loop was likely to fail in this case, too, so passing an offset to for_each_recent_reflog_ent() never worked. Change it to error out if strbuf_getwholeline() fails instead. Reported-by: NVladimir Panteleev <vladimir@thecybershadow.net> Signed-off-by: NRene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 René Scharfe 提交于
Correct the calculation of the number of digits for line counts of the form 10^n-1 (9, 99, ...) in lineno_width(). This makes blame stop printing an extra space before the line numbers of files with that many total lines. Signed-off-by: NRene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 12 3月, 2010 1 次提交
-
-
由 Junio C Hamano 提交于
Consistently using test_cmp would make debugging test scripts far easier, as output from them run under "-v" option becomes readable. Besides, some platforms' "diff" implementations lack "-q" option. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 08 3月, 2010 25 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* mw/maint-gcc-warns-unused-write: run-command.c: fix build warnings on Ubuntu
-
由 Junio C Hamano 提交于
* fn/maint-mkdtemp-compat: Fix gitmkdtemp: correct test for mktemp() return value
-
由 Junio C Hamano 提交于
* gb/maint-submodule-env: is_submodule_modified(): clear environment properly submodules: ensure clean environment when operating in a submodule shell setup: clear_local_git_env() function rev-parse: --local-env-vars option Refactor list of of repo-local env vars
-
由 Junio C Hamano 提交于
* as/maint-expire: reflog: honor gc.reflogexpire=never prune: honor --expire=never
-
由 Junio C Hamano 提交于
* ml/maint-grep-doc: grep docs: document --no-index option grep docs: --cached and <tree>... are incompatible grep docs: use AsciiDoc literals consistently grep docs: pluralize "Example" section
-
由 Junio C Hamano 提交于
* jk/maint-push-tracking-wo-remote: push: fix segfault for odd config
-
由 Junio C Hamano 提交于
* jc/fetch-param: fetch --all/--multiple: keep all the fetched branch information builtin-fetch --all/--multi: propagate options correctly t5521: fix and modernize
-
由 Junio C Hamano 提交于
* ne/pack-local-doc: pack-objects documentation: Fix --honor-pack-keep as well. pack-objects documentation: reword "objects that appear in the standard input" Documentation: pack-objects: Clarify --local's semantics.
-
由 Junio C Hamano 提交于
* jk/maint-add--interactive-delete: add-interactive: fix bogus diff header line ordering
-
由 Junio C Hamano 提交于
* mm/mkstemps-mode-for-packfiles: Use git_mkstemp_mode instead of plain mkstemp to create object files git_mkstemps_mode: don't set errno to EINVAL on exit. Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later. git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument. Move gitmkstemps to path.c Add a testcase for ACL with restrictive umask.
-
由 Junio C Hamano 提交于
* jc/maint-fix-mailinfo-strip: mailinfo: do not strip leading spaces even for a header line
-
由 Junio C Hamano 提交于
* jc/grep-author-all-match-implicit: "log --author=me --grep=it" should find intersection, not union
-
由 Junio C Hamano 提交于
* jc/checkout-detached: Reword "detached HEAD" notification
-
由 Junio C Hamano 提交于
* maint-1.6.6:
-
由 Junio C Hamano 提交于
* jc/maint-fix-test-perm: lib-patch-mode.sh: Fix permission t6000lib: Fix permission
-
由 Junio C Hamano 提交于
* sp/maint-push-sideband: receive-pack: Send internal errors over side-band #2 t5401: Use a bare repository for the remote peer receive-pack: Send hook output over side band #2 receive-pack: Wrap status reports inside side-band-64k receive-pack: Refactor how capabilities are shown to the client send-pack: demultiplex a sideband stream with status data run-command: support custom fd-set in async run-command: Allow stderr to be a caller supplied pipe
-
由 Junio C Hamano 提交于
* hm/maint-imap-send-crlf: git-imap-send: Convert LF to CRLF before storing patch to draft box
-
由 Junio C Hamano 提交于
* gf/maint-sh-setup-nongit-ok: require_work_tree broken with NONGIT_OK
-
由 Junio C Hamano 提交于
* jk/maint-rmdir-fix: rm: fix bug in recursive subdirectory removal
-
由 Junio C Hamano 提交于
* rs/optim-text-wrap: utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text() utf8.c: remove strbuf_write() utf8.c: remove print_spaces() utf8.c: remove print_wrapped_text()
-
由 Junio C Hamano 提交于
* tr/maint-cherry-pick-list: cherry_pick_list: quit early if one side is empty
-
由 Junio C Hamano 提交于
* cc/maint-bisect-paths: bisect: error out when passing bad path parameters
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Bert Wesarg 提交于
I used to set GREP_OPTIONS to exclude *.orig and *.rej files. But with this the test t4252-am-options.sh fails because it calls grep with a .rej file: grep "@@ -1,3 +1,3 @@" file-2.rej Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 07 3月, 2010 2 次提交
-
-
由 Matthieu Moy 提交于
Signed-off-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Stephen Boyd 提交于
These tests have been broken since they were introduced in commits ca2cedba (git-submodule: add support for --rebase., 2009-04-24) and 42b49178 (git-submodule: add support for --merge., 2009-06-03). 'git submodule init' expects the submodules to exist in the index. In this case, the submodules don't exist and therefore looking for the submodules will always fail. To make matters worse, git submodule fails visibly to the user by saying: error: pathspec 'rebasing' did not match any file(s) known to git. Did you forget to 'git add'? but doesn't return an error code. This allows the test to fail silently. Fix it by adding the submodules first. Cc: Johan Herland <johan@herland.net> Cc: Peter Hutterer <peter.hutterer@who-t.net> Cc: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: NStephen Boyd <bebarino@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 05 3月, 2010 5 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* jn/gitweb-config-error-die: gitweb: Die if there are parsing errors in config file
-
由 Junio C Hamano 提交于
* jn/maint-fix-pager: tests: Fix race condition in t7006-pager t7006-pager: if stdout is not a terminal, make a new one tests: Add tests for automatic use of pager am: Fix launching of pager git svn: Fix launching of pager git.1: Clarify the behavior of the --paginate option Make 'git var GIT_PAGER' always print the configured pager Fix 'git var' usage synopsis
-
由 Junio C Hamano 提交于
* tr/maint-cherry-pick-list: cherry_pick_list: quit early if one side is empty
-
由 Junio C Hamano 提交于
* ld/maint-diff-quiet-w: git-diff: add a test for git diff --quiet -w git diff --quiet -w: check and report the status
-