Junio C Hamano [Mon, 21 Jun 2010 13:02:41 +0000 (06:02 -0700)]
Merge branch 'em/checkout-orphan'
* em/checkout-orphan:
log_ref_setup: don't return stack-allocated array
bash completion: add --orphan to 'git checkout'
t3200: test -l with core.logAllRefUpdates options
checkout --orphan: respect -l option always
refs: split log_ref_write logic into log_ref_setup
Documentation: alter checkout --orphan description
Junio C Hamano [Mon, 21 Jun 2010 12:49:26 +0000 (05:49 -0700)]
Drop items that are 1.7.1.1 fixes from the 1.7.1 release notes
Junio C Hamano [Mon, 21 Jun 2010 12:48:50 +0000 (05:48 -0700)]
Merge branch 'maint'
* maint:
Update draft release notes to 1.7.1.1
Junio C Hamano [Mon, 21 Jun 2010 12:48:18 +0000 (05:48 -0700)]
Update draft release notes to 1.7.1.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Mon, 21 Jun 2010 12:41:03 +0000 (05:41 -0700)]
Merge branch 'mc/maint-zoneparse' into maint
* mc/maint-zoneparse:
Add "Z" as an alias for the timezone "UTC"
Junio C Hamano [Mon, 21 Jun 2010 12:40:57 +0000 (05:40 -0700)]
Merge branch 'jk/diff-m-doc' into maint
* jk/diff-m-doc:
docs: clarify meaning of -M for git-log
Junio C Hamano [Mon, 21 Jun 2010 12:40:53 +0000 (05:40 -0700)]
Merge branch 'jn/maint-doc-ignore' into maint
* jn/maint-doc-ignore:
gitignore.5: Clarify matching rules
Junio C Hamano [Mon, 21 Jun 2010 12:40:48 +0000 (05:40 -0700)]
Merge branch 'bs/userdiff-php' into maint
* bs/userdiff-php:
diff: Support visibility modifiers in the PHP hunk header regexp
Junio C Hamano [Mon, 21 Jun 2010 12:40:41 +0000 (05:40 -0700)]
Merge branch 'jk/maint-sha1-file-name-fix' into maint
* jk/maint-sha1-file-name-fix:
remove over-eager caching in sha1_file_name
Junio C Hamano [Mon, 21 Jun 2010 12:40:33 +0000 (05:40 -0700)]
Merge branch 'jk/maint-pull-dry-run-noop' into maint
* jk/maint-pull-dry-run-noop:
pull: do nothing on --dry-run
Junio C Hamano [Mon, 21 Jun 2010 12:40:10 +0000 (05:40 -0700)]
Merge branch 'bw/diff-metainfo-color' into maint
* bw/diff-metainfo-color:
diff: fix coloring of extended diff headers
Junio C Hamano [Mon, 21 Jun 2010 12:39:23 +0000 (05:39 -0700)]
Merge branch 'cb/assume-unchanged-fix' into maint
* cb/assume-unchanged-fix:
Documentation: git-add does not update files marked "assume unchanged"
do not overwrite files marked "assume unchanged"
Junio C Hamano [Mon, 21 Jun 2010 12:39:16 +0000 (05:39 -0700)]
Merge branch 'jn/notes-doc' into maint
* jn/notes-doc:
Documentation/notes: nitpicks
Documentation/notes: clean up description of rewriting configuration
Documentation/notes: simplify treatment of default display refs
Documentation/log: add a CONFIGURATION section
Documentation/notes: simplify treatment of default notes ref
Documentation/notes: add configuration section
Documentation/notes: describe content of notes blobs
Documentation/notes: document format of notes trees
Junio C Hamano [Mon, 21 Jun 2010 12:39:02 +0000 (05:39 -0700)]
Merge branch 'ab/test-cleanup' into maint
* ab/test-cleanup:
Turn setup code in t2007-checkout-symlink.sh into a test
Move t6000lib.sh to lib-*
Junio C Hamano [Mon, 21 Jun 2010 12:38:50 +0000 (05:38 -0700)]
Merge branch 'rs/diff-no-minimal' into maint
* rs/diff-no-minimal:
git diff too slow for a file
Junio C Hamano [Mon, 21 Jun 2010 12:38:36 +0000 (05:38 -0700)]
Merge branch 'bg/apply-blank-trailing-context' into maint
* bg/apply-blank-trailing-context:
apply: Allow blank *trailing* context lines to match beyond EOF
Junio C Hamano [Mon, 21 Jun 2010 06:21:27 +0000 (23:21 -0700)]
Merge branch 'maint'
* maint:
gitweb/Makefile: fix typo in gitweb.min.css rule
Conflicts:
gitweb/Makefile
Ævar Arnfjörð Bjarmason [Sat, 19 Jun 2010 16:06:58 +0000 (16:06 +0000)]
git-cvsserver: fix error for invalid password formats
Change the error message to report the erroneous password
character. $1 was never set in the previos version, it was a leftover
from older code that used a regex for the test.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason [Sat, 19 Jun 2010 16:06:57 +0000 (16:06 +0000)]
git-cvsserver: typo in a comment: bas -> has
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jay Soffian [Fri, 18 Jun 2010 21:01:25 +0000 (17:01 -0400)]
gitweb/Makefile: fix typo in gitweb.min.css rule
This typo has been in place since the rule was originally added by
0e6ce21 (Gitweb: add support for minifying gitweb.css).
Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Fri, 18 Jun 2010 18:27:01 +0000 (11:27 -0700)]
Update draft release notes to 1.7.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Fri, 18 Jun 2010 18:16:57 +0000 (11:16 -0700)]
Merge branch 'cc/maint-diff-CC-binary'
* cc/maint-diff-CC-binary:
diff: fix "git show -C -C" output when renaming a binary file
Conflicts:
diff.c
Junio C Hamano [Fri, 18 Jun 2010 18:16:57 +0000 (11:16 -0700)]
Merge branch 'by/diff-graph'
* by/diff-graph:
Make --color-words work well with --graph
graph.c: register a callback for graph output
Emit a whole line in one go
diff.c: Output the text graph padding before each diff line
Output the graph columns at the end of the commit message
Add a prefix output callback to diff output
Conflicts:
diff.c
Junio C Hamano [Fri, 18 Jun 2010 18:16:56 +0000 (11:16 -0700)]
Merge branch 'cb/ls-files-cdup'
* cb/ls-files-cdup:
ls-files: allow relative pathspec
quote.c: separate quoting and relative path generation
Junio C Hamano [Fri, 18 Jun 2010 18:16:56 +0000 (11:16 -0700)]
Merge branch 'jc/t9129-any-utf8'
* jc/t9129-any-utf8:
t9129: fix UTF-8 locale detection
Junio C Hamano [Fri, 18 Jun 2010 18:16:56 +0000 (11:16 -0700)]
Merge branch 'rr/am-help'
* rr/am-help:
git am: Remove stray error message from sed
git am: Display some help text when patch is empty
git am: Set cmdline globally
Junio C Hamano [Fri, 18 Jun 2010 18:16:56 +0000 (11:16 -0700)]
Merge branch 'jn/rebase-cmdline-fix'
* jn/rebase-cmdline-fix:
rebase: improve error message when upstream argument is missing
Junio C Hamano [Fri, 18 Jun 2010 18:16:56 +0000 (11:16 -0700)]
Merge branch 'ps/gitweb--browse-chrome'
* ps/gitweb--browse-chrome:
git-web--browse: Add support for google chrome and chromium
Junio C Hamano [Fri, 18 Jun 2010 18:16:56 +0000 (11:16 -0700)]
Merge branch 'jk/am-skip-hint'
* jk/am-skip-hint:
git-am: suggest what to do with superfluous patches
Junio C Hamano [Fri, 18 Jun 2010 18:16:56 +0000 (11:16 -0700)]
Merge branch 'jh/diff-index-line-abbrev'
* jh/diff-index-line-abbrev:
diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s
Conflicts:
diff.c
Junio C Hamano [Fri, 18 Jun 2010 18:16:55 +0000 (11:16 -0700)]
Merge branch 'ab/maint-perl-use-instlibdir'
* ab/maint-perl-use-instlibdir:
Makefile: remove redundant munging of @@INSTLIBDIR@@
Junio C Hamano [Fri, 18 Jun 2010 18:16:55 +0000 (11:16 -0700)]
Merge branch 'ec/diff-noprefix-config'
* ec/diff-noprefix-config:
diff: add configuration option for disabling diff prefixes.
Junio C Hamano [Fri, 18 Jun 2010 18:16:55 +0000 (11:16 -0700)]
Merge branch 'mg/status-b'
* mg/status-b:
Documentation+t5708: document and test status -s -b
Show branch information in short output of git status
Junio C Hamano [Fri, 18 Jun 2010 18:16:55 +0000 (11:16 -0700)]
Merge branch 'jn/gitweb-plackup'
* jn/gitweb-plackup:
git-instaweb: Add support for running gitweb via 'plackup'
git-instaweb: Wait for server to start before running web browser
git-instaweb: Remove pidfile after stopping web server
git-instaweb: Configure it to work with new gitweb structure
git-instaweb: Put httpd logs in a "$httpd_only" subdirectory
gitweb: Set default destination directory for installing gitweb in Makefile
gitweb: Move static files into seperate subdirectory
Junio C Hamano [Fri, 18 Jun 2010 18:16:55 +0000 (11:16 -0700)]
Merge branch 'jk/url-decode'
* jk/url-decode:
decode file:// and ssh:// URLs
make url-related functions reusable
Junio C Hamano [Fri, 18 Jun 2010 18:16:55 +0000 (11:16 -0700)]
Merge branch 'jn/remote-set-branches'
* jn/remote-set-branches:
Add git remote set-branches
Conflicts:
builtin/remote.c
Junio C Hamano [Fri, 18 Jun 2010 18:16:54 +0000 (11:16 -0700)]
Merge branch 'rc/ls-remote-default'
* rc/ls-remote-default:
ls-remote: print URL when no repo is specified
Junio C Hamano [Fri, 18 Jun 2010 18:16:54 +0000 (11:16 -0700)]
Merge branch 'hg/id-munging'
* hg/id-munging:
convert: Keep foreign $Id$ on checkout.
convert: Safer handling of $Id$ contraction.
Junio C Hamano [Fri, 18 Jun 2010 18:16:54 +0000 (11:16 -0700)]
Merge branch 'tc/merge-m-log'
* tc/merge-m-log:
merge: --log appends shortlog to message if specified
fmt-merge-msg: add function to append shortlog only
fmt-merge-msg: refactor merge title formatting
fmt-merge-msg: minor refactor of fmt_merge_msg()
merge: rename variable
merge: update comment
t7604-merge-custom-message: show that --log doesn't append to -m
t7604-merge-custom-message: shift expected output creation
Conflicts:
builtin.h
Junio C Hamano [Fri, 18 Jun 2010 18:16:53 +0000 (11:16 -0700)]
Merge branch 'ph/clone-message-reword'
* ph/clone-message-reword:
clone: reword messages to match the end-user perception
Junio C Hamano [Thu, 17 Jun 2010 00:10:11 +0000 (17:10 -0700)]
Update draft release notes to 1.7.2
... to exclude items meant to go to 1.7.1.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 17 Jun 2010 00:09:20 +0000 (17:09 -0700)]
Merge 'maint' updates in
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 16 Jun 2010 23:56:53 +0000 (16:56 -0700)]
Prepare draft release notes to 1.7.1.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Wed, 16 Jun 2010 23:33:47 +0000 (16:33 -0700)]
Merge branch 'cw/maint-exec-defpath' into maint
* cw/maint-exec-defpath:
autoconf: Check if <paths.h> exists and set HAVE_PATHS_H
exec_cmd.c: replace hard-coded path list with one from <paths.h>
Junio C Hamano [Wed, 16 Jun 2010 23:32:15 +0000 (16:32 -0700)]
Merge branch 'sc/http-late-auth' into maint
* sc/http-late-auth:
Prompt for a username when an HTTP request 401s
Junio C Hamano [Wed, 16 Jun 2010 23:23:51 +0000 (16:23 -0700)]
Merge branch 'by/blame-doc-m-c' into maint
* by/blame-doc-m-c:
blame-options.txt: Add default value for `-M/-C` options.
Junio C Hamano [Wed, 16 Jun 2010 23:23:48 +0000 (16:23 -0700)]
Merge branch 'cb/maint-stash-orphaned-file' into maint
* cb/maint-stash-orphaned-file:
stash tests: stash can lose data in a file removed from the index
stash: Don't overwrite files that have gone from the index
Junio C Hamano [Wed, 16 Jun 2010 23:23:42 +0000 (16:23 -0700)]
Merge branch 'mg/advice-statushints' into maint
* mg/advice-statushints:
wt-status: take advice.statusHints seriously
t7508: test advice.statusHints
Junio C Hamano [Wed, 16 Jun 2010 23:23:22 +0000 (16:23 -0700)]
Merge branch 'jn/maint-bundle' into maint
* jn/maint-bundle:
fix "bundle --stdin" segfault
t5704 (bundle): add tests for bundle --stdin
Junio C Hamano [Wed, 16 Jun 2010 23:23:14 +0000 (16:23 -0700)]
Merge branch 'rr/doc-submitting' into maint
* rr/doc-submitting:
SubmittingPatches: Add new section about what to base work on
Junio C Hamano [Wed, 16 Jun 2010 23:22:57 +0000 (16:22 -0700)]
Merge branch 'jn/t7006-fixup' into maint
* jn/t7006-fixup:
t7006: guard cleanup with test_expect_success
Junio C Hamano [Wed, 16 Jun 2010 23:22:51 +0000 (16:22 -0700)]
Merge branch 'jn/shortlog' into maint
* jn/shortlog:
pretty: Respect --abbrev option
shortlog: Document and test --format option
t4201 (shortlog): Test output format with multiple authors
t4201 (shortlog): guard setup with test_expect_success
Documentation/shortlog: scripted users should not rely on implicit HEAD
Junio C Hamano [Wed, 16 Jun 2010 23:22:23 +0000 (16:22 -0700)]
Merge branch 'np/index-pack-memsave' into maint
* np/index-pack-memsave:
index-pack: smarter memory usage when appending objects
index-pack: rationalize unpack_entry_data()
index-pack: smarter memory usage when resolving deltas
Junio C Hamano [Wed, 16 Jun 2010 23:21:30 +0000 (16:21 -0700)]
Merge branch 'sp/maint-dumb-http-pack-reidx' into maint
* sp/maint-dumb-http-pack-reidx:
http.c::new_http_pack_request: do away with the temp variable filename
http-fetch: Use temporary files for pack-*.idx until verified
http-fetch: Use index-pack rather than verify-pack to check packs
Allow parse_pack_index on temporary files
Extract verify_pack_index for reuse from verify_pack
Introduce close_pack_index to permit replacement
http.c: Remove unnecessary strdup of sha1_to_hex result
http.c: Don't store destination name in request structures
http.c: Drop useless != NULL test in finish_http_pack_request
http.c: Tiny refactoring of finish_http_pack_request
t5550-http-fetch: Use subshell for repository operations
http.c: Remove bad free of static block
Junio C Hamano [Wed, 16 Jun 2010 23:21:23 +0000 (16:21 -0700)]
Merge branch 'jc/am-3-show-corrupted-patch' into maint
* jc/am-3-show-corrupted-patch:
am -3: recover the diagnostic messages for corrupt patches
Junio C Hamano [Wed, 16 Jun 2010 23:21:15 +0000 (16:21 -0700)]
Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' into maint
* sp/maint-describe-tiebreak-with-tagger-date:
describe: Break annotated tag ties by tagger date
tag.c: Parse tagger date (if present)
tag.c: Refactor parse_tag_buffer to be saner to program
tag.h: Remove unused signature field
tag.c: Correct indentation
Junio C Hamano [Wed, 16 Jun 2010 23:21:06 +0000 (16:21 -0700)]
Merge branch 'np/malloc-threading' into maint
* np/malloc-threading:
Thread-safe xmalloc and xrealloc needs a recursive mutex
Make xmalloc and xrealloc thread-safe
Junio C Hamano [Wed, 16 Jun 2010 23:20:06 +0000 (16:20 -0700)]
Merge branch 'bg/send-email-smtpdomain' into maint
* bg/send-email-smtpdomain:
send-email: Cleanup smtp-domain and add config
Document send-email --smtp-domain
send-email: Don't use FQDNs without a '.'
send-email: Cleanup { style
Junio C Hamano [Wed, 16 Jun 2010 23:19:43 +0000 (16:19 -0700)]
Merge branch 'rc/maint-curl-helper' into maint
* rc/maint-curl-helper:
remote-curl: ensure that URLs have a trailing slash
http: make end_url_with_slash() public
t5541-http-push: add test for URLs with trailing slash
Conflicts:
remote-curl.c
Junio C Hamano [Wed, 16 Jun 2010 23:17:54 +0000 (16:17 -0700)]
Merge branch 'hg/maint-attr-fix' into maint
* hg/maint-attr-fix:
attr: Expand macros immediately when encountered.
attr: Allow multiple changes to an attribute on the same line.
attr: Fixed debug output for macro expansion.
Junio C Hamano [Wed, 16 Jun 2010 23:16:40 +0000 (16:16 -0700)]
Merge branch 'mh/status-optionally-refresh' into maint
* mh/status-optionally-refresh:
t7508: add a test for "git status" in a read-only repository
git status: refresh the index if possible
t7508: add test for "git status" refreshing the index
Ævar Arnfjörð Bjarmason [Mon, 14 Jun 2010 23:40:05 +0000 (23:40 +0000)]
notes: Initialize variable to appease Sun Studio
Sun Studio 12 Update 1 thinks that *t could be uninitialized,
ostensibly because it doesn't take rewrite_cmd into account in its
static analysis.
builtin/notes.c: In function `notes_copy_from_stdin':
builtin/notes.c:419: warning: 't' might be used uninitialized in this function
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Mon, 14 Jun 2010 16:53:02 +0000 (09:53 -0700)]
Update draft release notes to 1.7.2
It is loooong overdue.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Mon, 14 Jun 2010 17:05:09 +0000 (10:05 -0700)]
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn:
git svn: avoid unnecessary '/' in paths for SVN
git-svn: strip off leading slashes on --trunk argument
Eric Wong [Mon, 14 Jun 2010 04:31:10 +0000 (04:31 +0000)]
git svn: avoid unnecessary '/' in paths for SVN
svn:// servers are more picky regarding redundant slashes
than file:// and http(s)://-backed respositories. Since
the last commit, we avoid putting unnecessary slashes in
$GIT_CONFIG, but this doesn't help users who are already
set up that way.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Jonathan Nieder [Sun, 13 Jun 2010 11:27:43 +0000 (06:27 -0500)]
git-svn: strip off leading slashes on --trunk argument
The following command
git svn clone \
-r9500:10006 \
svn://svn.debian.org/svn/pkg-games/packages \
--trunk=/trunk/freedoom \
--branches=/branches/freedoom \
--tags=/tags/freedoom \
freedoom.git.
2009091
produces strange results:
With v1.6.3.3 (and perhaps earlier versions), this would fetch up to
and including r9978 (the last revision of the no_iwad_alternatives
branch before it was deleted), check it out, and prematurely declare
success, leaving out some commits to the trunk (r9984, r9985, r10006)
from after the branch was merged.
With v1.6.5-rc0~74 (svn: allow branches outside of refs/remotes,
2009-08-11) and later, this fetches up to and including r9978 and then
attempts a post-fetch checkout and fails.
r9978 =
25f0920175c395f0f22f54ae7a2318147f745274
(refs/remotes/no_iwad_alternatives)
fatal: refs/remotes/trunk: not a valid SHA1
update-ref refs/heads/master refs/remotes/trunk: command returned error: 128
Checking .git/config reveals
fetch = packages//trunk/freedoom:refs/remotes/trunk
And with both 1.6.3.3 and 1.7.1, using --trunk=trunk/freedom without
the leading slash (/) works fine.
Moral: git-svn needs to scrub an initial / from $_trunk and related
arguments it receives. Make it so.
Reported-by: Jon Dowland <jmtd@debian.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
Junio C Hamano [Mon, 14 Jun 2010 04:02:16 +0000 (21:02 -0700)]
Merge branch 'maint'
* maint:
git-mailinfo documentation: clarify -u/--encoding
Zhang Le [Sun, 13 Jun 2010 18:49:47 +0000 (02:49 +0800)]
git-mailinfo documentation: clarify -u/--encoding
Instead of talking about hardcoded UTF-8, describe i18n.commitencoding
and the --encoding option, and state that they default to UTF-8.
Signed-off-by: Zhang Le <r0bertz@gentoo.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Sun, 13 Jun 2010 18:22:42 +0000 (11:22 -0700)]
Merge branch 'ab/cvsserver'
* ab/cvsserver:
git-cvsserver: test for pserver authentication support
git-cvsserver: document making a password without htpasswd
git-cvsserver: Improved error handling for pserver
git-cvsserver: indent & clean up authdb code
git-cvsserver: use a password file cvsserver pserver
git-cvsserver: authentication support for pserver
Junio C Hamano [Sun, 13 Jun 2010 18:22:39 +0000 (11:22 -0700)]
Merge branch 'mg/notes-dry-run'
* mg/notes-dry-run:
notes: dry-run and verbose options for prune
Junio C Hamano [Sun, 13 Jun 2010 18:22:30 +0000 (11:22 -0700)]
Merge branch 'mc/maint-zoneparse'
* mc/maint-zoneparse:
Add "Z" as an alias for the timezone "UTC"
Junio C Hamano [Sun, 13 Jun 2010 18:22:27 +0000 (11:22 -0700)]
Merge branch 'jk/diff-m-doc'
* jk/diff-m-doc:
docs: clarify meaning of -M for git-log
Junio C Hamano [Sun, 13 Jun 2010 18:22:15 +0000 (11:22 -0700)]
Merge branch 'jn/maint-doc-ignore'
* jn/maint-doc-ignore:
gitignore.5: Clarify matching rules
Junio C Hamano [Sun, 13 Jun 2010 18:22:09 +0000 (11:22 -0700)]
Merge branch 'jn/fsck-ident'
* jn/fsck-ident:
fsck: fix bogus commit header check
Junio C Hamano [Sun, 13 Jun 2010 18:22:05 +0000 (11:22 -0700)]
Merge branch 'bs/userdiff-php'
* bs/userdiff-php:
diff: Support visibility modifiers in the PHP hunk header regexp
Junio C Hamano [Sun, 13 Jun 2010 18:22:00 +0000 (11:22 -0700)]
Merge branch 'jk/maint-sha1-file-name-fix'
* jk/maint-sha1-file-name-fix:
remove over-eager caching in sha1_file_name
Junio C Hamano [Sun, 13 Jun 2010 18:21:55 +0000 (11:21 -0700)]
Merge branch 'jk/maint-pull-dry-run-noop'
* jk/maint-pull-dry-run-noop:
pull: do nothing on --dry-run
Junio C Hamano [Sun, 13 Jun 2010 18:21:49 +0000 (11:21 -0700)]
Merge branch 'ab/submodule-foreach-toplevel'
* ab/submodule-foreach-toplevel:
git-submodule foreach: Add $toplevel variable
Junio C Hamano [Sun, 13 Jun 2010 18:21:44 +0000 (11:21 -0700)]
Merge branch 'rs/grep-binary'
* rs/grep-binary:
grep: support NUL chars in search strings for -F
grep: use REG_STARTEND for all matching if available
grep: continue case insensitive fixed string search after NUL chars
grep: use memmem() for fixed string search
grep: --name-only over binary
grep: --count over binary
grep: grep: refactor handling of binary mode options
grep: add test script for binary file handling
Junio C Hamano [Sun, 13 Jun 2010 18:21:37 +0000 (11:21 -0700)]
Merge branch 'jn/gitweb-syntax-highlight'
* jn/gitweb-syntax-highlight:
gitweb: Refactor syntax highlighting support
gitweb: Syntax highlighting support
Junio C Hamano [Sun, 13 Jun 2010 18:21:30 +0000 (11:21 -0700)]
Merge branch 'js/maint-windows'
* js/maint-windows:
Recent MinGW has a C99 implementation of snprintf functions
mingw: use _commit to implement fsync
Junio C Hamano [Sun, 13 Jun 2010 18:21:25 +0000 (11:21 -0700)]
Merge branch 'bw/diff-metainfo-color'
* bw/diff-metainfo-color:
diff: fix coloring of extended diff headers
Junio C Hamano [Sun, 13 Jun 2010 18:21:21 +0000 (11:21 -0700)]
Merge branch 'js/try-to-free-stackable'
* js/try-to-free-stackable:
Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used
Have set_try_to_free_routine return the previous routine
Junio C Hamano [Sun, 13 Jun 2010 18:21:17 +0000 (11:21 -0700)]
Merge branch 'jn/make-header-dependency'
* jn/make-header-dependency:
Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIES
Makefile: fix header dependency checker to allow NO_CURL builds
Junio C Hamano [Sun, 13 Jun 2010 18:21:11 +0000 (11:21 -0700)]
Merge branch 'cb/assume-unchanged-fix'
* cb/assume-unchanged-fix:
Documentation: git-add does not update files marked "assume unchanged"
do not overwrite files marked "assume unchanged"
Junio C Hamano [Sun, 13 Jun 2010 18:21:06 +0000 (11:21 -0700)]
Merge branch 'jn/notes-doc'
* jn/notes-doc:
Documentation/notes: nitpicks
Documentation/notes: clean up description of rewriting configuration
Documentation/notes: simplify treatment of default display refs
Documentation/log: add a CONFIGURATION section
Documentation/notes: simplify treatment of default notes ref
Documentation/notes: add configuration section
Documentation/notes: describe content of notes blobs
Documentation/notes: document format of notes trees
Junio C Hamano [Sun, 13 Jun 2010 18:21:00 +0000 (11:21 -0700)]
Merge branch 'wp/pretty-enhancement'
* wp/pretty-enhancement:
pretty: initialize new cmt_fmt_map to 0
pretty: add aliases for pretty formats
pretty: add infrastructure for commit format aliases
pretty: make it easier to add new formats
Junio C Hamano [Sun, 13 Jun 2010 18:20:57 +0000 (11:20 -0700)]
Merge branch 'ab/test-cleanup'
* ab/test-cleanup:
Turn setup code in t2007-checkout-symlink.sh into a test
Move t6000lib.sh to lib-*
Junio C Hamano [Sun, 13 Jun 2010 18:20:52 +0000 (11:20 -0700)]
Merge branch 'jn/maint-amend-missing-name'
* jn/maint-amend-missing-name:
commit --amend: cope with missing display name
Junio C Hamano [Sun, 13 Jun 2010 18:20:46 +0000 (11:20 -0700)]
Merge branch 'rs/diff-no-minimal'
* rs/diff-no-minimal:
git diff too slow for a file
Junio C Hamano [Sun, 13 Jun 2010 17:47:17 +0000 (10:47 -0700)]
Merge branch 'maint'
* maint:
add-interactive: Clarify “remaining hunks in the file”
Jonathan Nieder [Sun, 13 Jun 2010 03:32:51 +0000 (22:32 -0500)]
add-interactive: Clarify “remaining hunks in the file”
The "a" and "d" commands to ‘add --patch’ (accept/reject rest of file)
interact with "j", "g", and "/" (skip some hunks) in a perhaps
confusing way: after accepting or rejecting all _later_ hunks in the
file, they return to the earlier, skipped hunks and prompt the user
about them again.
This behavior can be very useful in practice. One can still accept or
reject _all_ undecided hunks in a file by using the "g" command to
move to hunk #1 first.
Reported-by: Frédéric Brière <fbriere@fbriere.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jakub Narebski [Sat, 12 Jun 2010 22:35:59 +0000 (00:35 +0200)]
gitweb: Fix typo in hash key name in %opts in git_header_html
The name of the key has to be the same in call site handle_errors_html
and in called subroutine that uses it, i.e. git_header_html.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Rast [Thu, 10 Jun 2010 12:54:03 +0000 (14:54 +0200)]
log_ref_setup: don't return stack-allocated array
859c301 (refs: split log_ref_write logic into log_ref_setup,
2010-05-21) refactors the stack allocation of the log_file array into
the new log_ref_setup() function, but passes it back to the caller.
Since the original intent seems to have been to split the work between
log_ref_setup and log_ref_write, make it the caller's responsibility
to allocate the buffer.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Sat, 12 Jun 2010 05:05:58 +0000 (22:05 -0700)]
Merge branch 'maint'
* maint:
t/README: document --root option
Makefile: default pager on AIX to "more"
Thomas Rast [Thu, 10 Jun 2010 18:24:46 +0000 (20:24 +0200)]
t/README: document --root option
We've had this option since
f423ef5 (tests: allow user to specify
trash directory location, 2009-08-09). Make it easier to look up :-)
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King [Thu, 10 Jun 2010 08:59:52 +0000 (04:59 -0400)]
Makefile: default pager on AIX to "more"
AIX doesn't ship with "less" by default, and their "more" is
more featureful than average, so the latter is a more
sensible choice. People who really want less can set the
compile-time option themselves, or users can set $PAGER.
Signed-off-by: Jeff King <peff@peff.net>
Tested-by: Tor Arntsen <tor@spacetec.no>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Sixt [Tue, 8 Jun 2010 11:34:12 +0000 (13:34 +0200)]
merge-recursive: demonstrate an incorrect conflict with submodule
When one side of a merge turns a directory into a submodule, and the other
side does not touch that directory (but has other non-conflicting changes),
then a merge should succeed. But currently, it does not; it rather fails
with a file/directory conflict.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King [Thu, 10 Jun 2010 08:59:52 +0000 (04:59 -0400)]
Makefile: default pager on AIX to "more"
AIX doesn't ship with "less" by default, and their "more" is
more featureful than average, so the latter is a more
sensible choice. People who really want less can set the
compile-time option themselves, or users can set $PAGER.
Signed-off-by: Jeff King <peff@peff.net>
Tested-by: Tor Arntsen <tor@spacetec.no>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Tue, 8 Jun 2010 05:15:31 +0000 (22:15 -0700)]
Merge branch 'maint'
* maint:
Change C99 comments to old-style C comments