summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-03-16t/t1304: avoid -d option to setfaclLibravatar Brandon Casey1-2/+2
Some platforms (Solaris) have a setfacl whose -d switch works differently than the one on Linux. On Linux, it causes all operations to be applied to the Default ACL. There is a notation for operating on the Default ACL: [d[efault]:] [u[ser]:]uid [:perms] so use it instead of the -d switch. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-03-15Merge branch 'sd/format-patch-to'Libravatar Junio C Hamano5-46/+197
* sd/format-patch-to: send-email: add --no-cc, --no-to, and --no-bcc format-patch: add --no-cc, --no-to, and --no-add-headers format-patch: use a string_list for headers Add 'git format-patch --to=' option and 'format.to' configuration variable.
2010-03-15Merge branch 'tc/http-cleanup'Libravatar Junio C Hamano8-39/+66
* tc/http-cleanup: remote-curl: init walker only when needed remote-curl: use http_fetch_ref() instead of walker wrapper http: init and cleanup separately from http-walker http-walker: cleanup more thoroughly http-push: remove "|| 1" to enable verbose check t554[01]-http-push: refactor, add non-ff tests t5541-http-push: check that ref is unchanged for non-ff test
2010-03-15Merge branch 'tc/transport-verbosity'Libravatar Junio C Hamano12-41/+92
* tc/transport-verbosity: transport: update flags to be in running order fetch and pull: learn --progress push: learn --progress transport->progress: use flag authoritatively clone: support multiple levels of verbosity push: support multiple levels of verbosity fetch: refactor verbosity option handling into transport.[ch] Documentation/git-push: put --quiet before --verbose Documentation/git-pull: put verbosity options before merge/fetch ones Documentation/git-clone: mention progress in -v Conflicts: transport.h
2010-03-15Merge branch 'ld/push-porcelain'Libravatar Junio C Hamano5-9/+67
* ld/push-porcelain: t5516: Use test_cmp when appropriate git-push: add tests for git push --porcelain git-push: make git push --porcelain print "Done" git-push: send "To <remoteurl>" messages to the standard output in --porcelain mode git-push: fix an advice message so it goes to stderr Conflicts: transport.c
2010-03-15Merge branch 'jh/notes'Libravatar Junio C Hamano14-196/+2167
* jh/notes: (33 commits) Documentation: fix a few typos in git-notes.txt notes: fix malformed tree entry builtin-notes: Minor (mostly parse_options-related) fixes builtin-notes: Add "copy" subcommand for copying notes between objects builtin-notes: Misc. refactoring of argc and exit value handling builtin-notes: Add -c/-C options for reusing notes builtin-notes: Refactor handling of -F option to allow combining -m and -F builtin-notes: Deprecate the -m/-F options for "git notes edit" builtin-notes: Add "append" subcommand for appending to note objects builtin-notes: Add "add" subcommand for adding notes to objects builtin-notes: Add --message/--file aliases for -m/-F options builtin-notes: Add "list" subcommand for listing note objects Documentation: Generalize git-notes docs to 'objects' instead of 'commits' builtin-notes: Add "prune" subcommand for removing notes for missing objects Notes API: prune_notes(): Prune notes that belong to non-existing objects t3305: Verify that removing notes triggers automatic fanout consolidation builtin-notes: Add "remove" subcommand for removing existing notes Teach builtin-notes to remove empty notes Teach notes code to properly preserve non-notes in the notes tree t3305: Verify that adding many notes with git-notes triggers increased fanout ... Conflicts: Makefile
2010-03-13Merge branch 'maint'Libravatar Junio C Hamano6-14/+47
* maint: don't use default revision if a rev was specified for_each_recent_reflog_ent(): use strbuf, fix offset handling t/Makefile: remove test artifacts upon "make clean" blame: fix indent of line numbers
2010-03-13don't use default revision if a rev was specifiedLibravatar Dave Olszewski2-2/+13
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: Dave Olszewski <cxreg@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-03-13for_each_recent_reflog_ent(): use strbuf, fix offset handlingLibravatar René Scharfe1-10/+12
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: Vladimir Panteleev <vladimir@thecybershadow.net> Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-03-13t/Makefile: remove test artifacts upon "make clean"Libravatar Junio C Hamano1-0/+2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-03-13blame: fix indent of line numbersLibravatar René Scharfe2-2/+20
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: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-03-13Merge git://git.bogomips.org/git-svnLibravatar Junio C Hamano3-2/+4
* git://git.bogomips.org/git-svn: t9150,t9151: Add rewrite-root option to init git-svn: Fix merge detecting with rewrite-root
2010-03-13t9150,t9151: Add rewrite-root option to initLibravatar Tuomas Suutari2-0/+2
The rewrite-root option seems to be a bit problematic with merge detecting, so it's better to have a merge detecting test with it turned on. Signed-off-by: Tuomas Suutari <tuomas.suutari@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net>
2010-03-13git-svn: Fix merge detecting with rewrite-rootLibravatar Tuomas Suutari1-2/+2
Detecting of merges from svn:mergeinfo or svk merge tickets failed with rewrite-root option. This fixes it. Signed-off-by: Tuomas Suutari <tuomas.suutari@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net>
2010-03-12Merge branch 'maint'Libravatar Junio C Hamano1-12/+12
* maint: t9400: Use test_cmp when appropriate
2010-03-11t5516: Use test_cmp when appropriateLibravatar Junio C Hamano1-3/+3
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: Junio C Hamano <gitster@pobox.com>
2010-03-11t9400: Use test_cmp when appropriateLibravatar Junio C Hamano1-12/+12
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: Junio C Hamano <gitster@pobox.com>
2010-03-10Merge branch 'sd/init-template'Libravatar Junio C Hamano6-12/+67
* sd/init-template: wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR t/t0001-init.sh: add test for 'init with init.templatedir set' init: having keywords without value is not a global error. Add a "TEMPLATE DIRECTORY" section to git-init[1]. Add `init.templatedir` configuration variable.
2010-03-10Merge branch 'sh/am-keep-cr'Libravatar Junio C Hamano6-10/+141
* sh/am-keep-cr: git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr` git-am: Add am.keepcr and --no-keep-cr to override it git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit documentation: 'git-mailsplit --keep-cr' is not hidden anymore
2010-03-10Merge branch 'cp/add-u-pathspec'Libravatar Junio C Hamano3-9/+39
* cp/add-u-pathspec: test for add with non-existent pathspec git add -u: die on unmatched pathspec
2010-03-10Makefile: update check-docs targetLibravatar Junio C Hamano1-1/+2
When we added bunch of git-remote-* helper backends, we should have done this to squelch complaints that they do not have their own manual pages. Also the entry for git-remote-helpers was not properly marked as a non-command. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-03-10Merge branch 'lt/deepen-builtin-source'Libravatar Junio C Hamano90-107/+107
* lt/deepen-builtin-source: Move 'builtin-*' into a 'builtin/' subdirectory Conflicts: Makefile
2010-03-08send-email: add --no-cc, --no-to, and --no-bccLibravatar Stephen Boyd2-4/+76
There's no way to override the sendemail.to, sendemail.cc, and sendemail.bcc config settings. Add options allowing the user to tell git to ignore the config settings and take whatever is on the command line. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-03-08format-patch: add --no-cc, --no-to, and --no-add-headersLibravatar Stephen Boyd2-7/+56
These new options allow users to override their config settings for format.cc, format.to and format.headers respectively. These options only make git ignore the config settings and any previous command line options, so you'll still have to add more command line options to add extra headers. For example, $ cat .git/config [format] to = Someone <someone@out.there> $ git format-patch -1 --no-to --to="Someone Else <else@out.there>" would format a patch addressed to "Someone Else" and not "Someone". Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-03-08format-patch: use a string_list for headersLibravatar Stephen Boyd1-39/+34
In the next patch we'll need to clear the header lists if the user specifies --no-add-headers or --no-to or --no-cc. This actually cuts down on the code a bit too. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-03-08Update draft release notes to 1.7.1Libravatar Junio C Hamano1-3/+21
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-03-08Merge branch 'maint'Libravatar Junio C Hamano1-0/+34
* maint: Merge accumulated fixes to prepare for 1.7.0.3 Conflicts: RelNotes
2010-03-08Merge accumulated fixes to prepare for 1.7.0.3Libravatar Junio C Hamano2-1/+35
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-03-08Merge branch 'mw/maint-gcc-warns-unused-write' into maintLibravatar Junio C Hamano1-4/+6
* mw/maint-gcc-warns-unused-write: run-command.c: fix build warnings on Ubuntu
2010-03-08Merge branch 'fn/maint-mkdtemp-compat' into maintLibravatar Junio C Hamano1-1/+1
* fn/maint-mkdtemp-compat: Fix gitmkdtemp: correct test for mktemp() return value
2010-03-08Merge branch 'gb/maint-submodule-env' into maintLibravatar Junio C Hamano8-33/+69
* 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
2010-03-08Merge branch 'as/maint-expire' into maintLibravatar Junio C Hamano4-18/+86
* as/maint-expire: reflog: honor gc.reflogexpire=never prune: honor --expire=never
2010-03-08Merge branch 'ml/maint-grep-doc' into maintLibravatar Junio C Hamano1-13/+17
* 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
2010-03-08Merge branch 'jk/maint-push-tracking-wo-remote' into maintLibravatar Junio C Hamano1-1/+1
* jk/maint-push-tracking-wo-remote: push: fix segfault for odd config
2010-03-08Merge branch 'jc/fetch-param' into maintLibravatar Junio C Hamano2-33/+88
* jc/fetch-param: fetch --all/--multiple: keep all the fetched branch information builtin-fetch --all/--multi: propagate options correctly t5521: fix and modernize
2010-03-08Merge branch 'ne/pack-local-doc' into maintLibravatar Junio C Hamano1-8/+7
* 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.
2010-03-08Merge branch 'jk/maint-add--interactive-delete' into maintLibravatar Junio C Hamano2-1/+31
* jk/maint-add--interactive-delete: add-interactive: fix bogus diff header line ordering
2010-03-08Merge branch 'mm/mkstemps-mode-for-packfiles' into maintLibravatar Junio C Hamano8-93/+172
* 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.
2010-03-08Merge branch 'jc/maint-fix-mailinfo-strip' into maintLibravatar Junio C Hamano2-3/+2
* jc/maint-fix-mailinfo-strip: mailinfo: do not strip leading spaces even for a header line
2010-03-08Merge branch 'jc/grep-author-all-match-implicit' into maintLibravatar Junio C Hamano6-10/+57
* jc/grep-author-all-match-implicit: "log --author=me --grep=it" should find intersection, not union
2010-03-08Merge branch 'jc/checkout-detached' into maintLibravatar Junio C Hamano5-12/+46
* jc/checkout-detached: Reword "detached HEAD" notification
2010-03-08Merge branch 'maint-1.6.6' into maintLibravatar Junio C Hamano0-0/+0
* maint-1.6.6:
2010-03-07Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6Libravatar Junio C Hamano2-0/+4
* jc/maint-fix-test-perm: lib-patch-mode.sh: Fix permission t6000lib: Fix permission
2010-03-07Merge branch 'sp/maint-push-sideband' into maint-1.6.6Libravatar Junio C Hamano10-133/+371
* 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
2010-03-07Merge branch 'hm/maint-imap-send-crlf' into maint-1.6.6Libravatar Junio C Hamano1-1/+39
* hm/maint-imap-send-crlf: git-imap-send: Convert LF to CRLF before storing patch to draft box
2010-03-07Merge branch 'gf/maint-sh-setup-nongit-ok' into maint-1.6.6Libravatar Junio C Hamano1-1/+1
* gf/maint-sh-setup-nongit-ok: require_work_tree broken with NONGIT_OK
2010-03-07Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6Libravatar Junio C Hamano2-1/+9
* jk/maint-rmdir-fix: rm: fix bug in recursive subdirectory removal
2010-03-07Merge branch 'rs/optim-text-wrap' into maint-1.6.6Libravatar Junio C Hamano3-37/+42
* 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()
2010-03-07Merge branch 'tr/maint-cherry-pick-list' into maint-1.6.6Libravatar Junio C Hamano1-0/+3
* tr/maint-cherry-pick-list: cherry_pick_list: quit early if one side is empty
2010-03-07Merge branch 'cc/maint-bisect-paths' into maint-1.6.6Libravatar Junio C Hamano2-0/+11
* cc/maint-bisect-paths: bisect: error out when passing bad path parameters