summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-06-21git-cvsserver: fix error for invalid password formatsÆvar Arnfjörð Bjarmason
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>
2010-06-21git-cvsserver: typo in a comment: bas -> hasÆvar Arnfjörð Bjarmason
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-18Update draft release notes to 1.7.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-18Merge branch 'cc/maint-diff-CC-binary'Junio C Hamano
* cc/maint-diff-CC-binary: diff: fix "git show -C -C" output when renaming a binary file Conflicts: diff.c
2010-06-18Merge branch 'by/diff-graph'Junio C Hamano
* 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
2010-06-18Merge branch 'cb/ls-files-cdup'Junio C Hamano
* cb/ls-files-cdup: ls-files: allow relative pathspec quote.c: separate quoting and relative path generation
2010-06-18Merge branch 'jc/t9129-any-utf8'Junio C Hamano
* jc/t9129-any-utf8: t9129: fix UTF-8 locale detection
2010-06-18Merge branch 'rr/am-help'Junio C Hamano
* 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
2010-06-18Merge branch 'jn/rebase-cmdline-fix'Junio C Hamano
* jn/rebase-cmdline-fix: rebase: improve error message when upstream argument is missing
2010-06-18Merge branch 'ps/gitweb--browse-chrome'Junio C Hamano
* ps/gitweb--browse-chrome: git-web--browse: Add support for google chrome and chromium
2010-06-18Merge branch 'jk/am-skip-hint'Junio C Hamano
* jk/am-skip-hint: git-am: suggest what to do with superfluous patches
2010-06-18Merge branch 'jh/diff-index-line-abbrev'Junio C Hamano
* jh/diff-index-line-abbrev: diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s Conflicts: diff.c
2010-06-18Merge branch 'ab/maint-perl-use-instlibdir'Junio C Hamano
* ab/maint-perl-use-instlibdir: Makefile: remove redundant munging of @@INSTLIBDIR@@
2010-06-18Merge branch 'ec/diff-noprefix-config'Junio C Hamano
* ec/diff-noprefix-config: diff: add configuration option for disabling diff prefixes.
2010-06-18Merge branch 'mg/status-b'Junio C Hamano
* mg/status-b: Documentation+t5708: document and test status -s -b Show branch information in short output of git status
2010-06-18Merge branch 'jn/gitweb-plackup'Junio C Hamano
* 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
2010-06-18Merge branch 'jk/url-decode'Junio C Hamano
* jk/url-decode: decode file:// and ssh:// URLs make url-related functions reusable
2010-06-18Merge branch 'jn/remote-set-branches'Junio C Hamano
* jn/remote-set-branches: Add git remote set-branches Conflicts: builtin/remote.c
2010-06-18Merge branch 'rc/ls-remote-default'Junio C Hamano
* rc/ls-remote-default: ls-remote: print URL when no repo is specified
2010-06-18Merge branch 'hg/id-munging'Junio C Hamano
* hg/id-munging: convert: Keep foreign $Id$ on checkout. convert: Safer handling of $Id$ contraction.
2010-06-18Merge branch 'tc/merge-m-log'Junio C Hamano
* 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
2010-06-18Merge branch 'ph/clone-message-reword'Junio C Hamano
* ph/clone-message-reword: clone: reword messages to match the end-user perception
2010-06-17Update draft release notes to 1.7.2Junio C Hamano
... to exclude items meant to go to 1.7.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-17Merge 'maint' updates inJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-17Prepare draft release notes to 1.7.1.1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-16Merge branch 'cw/maint-exec-defpath' into maintJunio C Hamano
* 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>
2010-06-16Merge branch 'sc/http-late-auth' into maintJunio C Hamano
* sc/http-late-auth: Prompt for a username when an HTTP request 401s
2010-06-16Merge branch 'by/blame-doc-m-c' into maintJunio C Hamano
* by/blame-doc-m-c: blame-options.txt: Add default value for `-M/-C` options.
2010-06-16Merge branch 'cb/maint-stash-orphaned-file' into maintJunio C Hamano
* 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
2010-06-16Merge branch 'mg/advice-statushints' into maintJunio C Hamano
* mg/advice-statushints: wt-status: take advice.statusHints seriously t7508: test advice.statusHints
2010-06-16Merge branch 'jn/maint-bundle' into maintJunio C Hamano
* jn/maint-bundle: fix "bundle --stdin" segfault t5704 (bundle): add tests for bundle --stdin
2010-06-16Merge branch 'rr/doc-submitting' into maintJunio C Hamano
* rr/doc-submitting: SubmittingPatches: Add new section about what to base work on
2010-06-16Merge branch 'jn/t7006-fixup' into maintJunio C Hamano
* jn/t7006-fixup: t7006: guard cleanup with test_expect_success
2010-06-16Merge branch 'jn/shortlog' into maintJunio C Hamano
* 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
2010-06-16Merge branch 'np/index-pack-memsave' into maintJunio C Hamano
* 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
2010-06-16Merge branch 'sp/maint-dumb-http-pack-reidx' into maintJunio C Hamano
* 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
2010-06-16Merge branch 'jc/am-3-show-corrupted-patch' into maintJunio C Hamano
* jc/am-3-show-corrupted-patch: am -3: recover the diagnostic messages for corrupt patches
2010-06-16Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' into maintJunio C Hamano
* 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
2010-06-16Merge branch 'np/malloc-threading' into maintJunio C Hamano
* np/malloc-threading: Thread-safe xmalloc and xrealloc needs a recursive mutex Make xmalloc and xrealloc thread-safe
2010-06-16Merge branch 'bg/send-email-smtpdomain' into maintJunio C Hamano
* 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
2010-06-16Merge branch 'rc/maint-curl-helper' into maintJunio C Hamano
* 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
2010-06-16Merge branch 'hg/maint-attr-fix' into maintJunio C Hamano
* 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.
2010-06-16Merge branch 'mh/status-optionally-refresh' into maintJunio C Hamano
* 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
2010-06-15notes: Initialize variable to appease Sun StudioÆvar Arnfjörð Bjarmason
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>
2010-06-14Update draft release notes to 1.7.2Junio C Hamano
It is loooong overdue. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-06-14Merge git://git.bogomips.org/git-svnJunio C Hamano
* git://git.bogomips.org/git-svn: git svn: avoid unnecessary '/' in paths for SVN git-svn: strip off leading slashes on --trunk argument
2010-06-14git svn: avoid unnecessary '/' in paths for SVNEric Wong
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>
2010-06-14git-svn: strip off leading slashes on --trunk argumentJonathan Nieder
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>
2010-06-14Merge branch 'maint'Junio C Hamano
* maint: git-mailinfo documentation: clarify -u/--encoding
2010-06-14git-mailinfo documentation: clarify -u/--encodingZhang Le
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>