summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-10-16Update draft release notes to 1.7.8Libravatar Junio C Hamano1-1/+3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-16Merge git://repo.or.cz/git-guiLibravatar Junio C Hamano9-29/+159
* git://repo.or.cz/git-gui: git-gui: incremental goto line in blame view git-gui: clear the goto line input when hiding git-gui: only accept numbers in the goto-line input git-gui: search and linenumber input are mutual exclusive in the blame view git-gui: deal with unknown files when pressing the "Stage Changed" button git-gui: drop the 'n' and 'Shift-n' bindings from the last patch. git-gui: Add keyboard shortcuts for search and goto commands in blame view. git-gui: Enable jumping to a specific line number in blame view. Fix tooltip display with multiple monitors on windows. Fix typo: existant->existent git-gui: updated translator README for current procedures. git-gui: warn when trying to commit on a detached head git-gui: Corrected a typo in the Swedish translation of 'Continue'
2011-10-16git-svn: Allow certain refs to be ignoredLibravatar Michael Olson1-5/+33
Implement a new --ignore-refs option which specifies a regex of refs to ignore while importing svn history. This is a useful supplement to the --ignore-paths option, as that option only operates on the contents of branches and tags, not the branches and tags themselves. Signed-off-by: Michael Olson <mwolson@gnu.org> Acked-by: Eric Wong <normalperson@yhbt.net>
2011-10-16git svn dcommit: new option --interactive.Libravatar Frédéric Heitzmann3-1/+146
Allow the user to check the patch set before it is commited to SVN. It is then possible to accept/discard one patch, accept all, or quit. This interactive mode is similar with 'git send email' behaviour. However, 'git svn dcommit' returns as soon as one patch is discarded. Part of the code was taken from git-send-email.perl (see 'ask' function) Tests several combinations of potential answers to 'git svn dcommit --interactive'. For each of them, test whether patches were commited to SVN or not. Thanks-to Eric Wong <normalperson@yhbt.net> for the initial idea. Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Frédéric Heitzmann <frederic.heitzmann@gmail.com>
2011-10-15Sync with maintLibravatar Junio C Hamano2-41/+39
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-15Prepare for 1.7.7.1Libravatar Junio C Hamano2-1/+40
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-15Merge branch 'ms/patch-id-with-overlong-line' into maintLibravatar Junio C Hamano1-4/+6
* ms/patch-id-with-overlong-line: patch-id.c: use strbuf instead of a fixed buffer
2011-10-15Merge branch 'jc/maint-bundle-too-quiet' into maintLibravatar Junio C Hamano4-5/+10
* jc/maint-bundle-too-quiet: Teach progress eye-candy to fetch_refs_from_bundle()
2011-10-15Merge branch 'jk/filter-branch-require-clean-work-tree' into maintLibravatar Junio C Hamano1-3/+1
* jk/filter-branch-require-clean-work-tree: filter-branch: use require_clean_work_tree
2011-10-15Merge branch 'jc/maint-fsck-fwrite-size-check' into maintLibravatar Junio C Hamano1-6/+3
* jc/maint-fsck-fwrite-size-check: fsck: do not abort upon finding an empty blob
2011-10-15Merge branch 'bk/ancestry-path' into maintLibravatar Junio C Hamano3-10/+101
* bk/ancestry-path: t6019: avoid refname collision on case-insensitive systems revision: do not include sibling history in --ancestry-path output revision: keep track of the end-user input from the command line rev-list: Demonstrate breakage with --ancestry-path --all
2011-10-15Merge branch 'jk/maint-fetch-submodule-check-fix' into maintLibravatar Junio C Hamano1-5/+72
* jk/maint-fetch-submodule-check-fix: fetch: avoid quadratic loop checking for updated submodules
2011-10-15Merge branch 'tr/mergetool-valgrind' into maintLibravatar Junio C Hamano1-0/+2
* tr/mergetool-valgrind: Symlink mergetools scriptlets into valgrind wrappers
2011-10-15Merge branch 'nm/grep-object-sha1-lock' into maintLibravatar Junio C Hamano1-0/+3
* nm/grep-object-sha1-lock: grep: Fix race condition in delta_base_cache Conflicts: builtin/grep.c
2011-10-15Merge branch 'jc/diff-index-unpack' into maintLibravatar Junio C Hamano5-6/+38
* jc/diff-index-unpack: diff-index: pass pathspec down to unpack-trees machinery unpack-trees: allow pruning with pathspec traverse_trees(): allow pruning with pathspec
2011-10-15Merge branch 'mm/rebase-i-exec-edit' into maintLibravatar Junio C Hamano2-4/+40
* mm/rebase-i-exec-edit: rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree rebase -i: clean error message for --continue after failed exec
2011-10-15Merge branch 'jc/grep-untracked-exclude'Libravatar Junio C Hamano1-1/+1
* jc/grep-untracked-exclude: grep: fix the error message that mentions --exclude
2011-10-15Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-excludeLibravatar Junio C Hamano1-1/+1
* jc/maint-grep-untracked-exclude: grep: fix the error message that mentions --exclude Conflicts: builtin/grep.c
2011-10-15grep: fix the error message that mentions --excludeLibravatar Bert Wesarg1-1/+1
Missing rename from --exclude to --standard-exclude. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-15git-gui: incremental goto line in blame viewLibravatar Bert Wesarg1-4/+11
The view jumps now to the given line number after each key press. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2011-10-15git-gui: clear the goto line input when hidingLibravatar Bert Wesarg1-0/+1
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2011-10-15git-gui: only accept numbers in the goto-line inputLibravatar Bert Wesarg1-2/+11
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2011-10-15git-gui: search and linenumber input are mutual exclusive in the blame viewLibravatar Bert Wesarg1-6/+16
It was possible to open the search input (Ctrl+S) and the goto-line input (Ctrl+G) at the same time. Prevent this. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2011-10-14send-email: Fix %config_path_settings handlingLibravatar Cord Seele2-2/+38
cec5dae (use new Git::config_path() for aliasesfile, 2011-09-30) broke the expansion of aliases. This was caused by treating %config_path_settings, newly introduced in said patch, like %config_bool_settings instead of like %config_settings. Copy from %config_settings, making it more readable. While at it add basic test for expansion of aliases, and for path expansion, which would catch this error. Nb. there were a few issues that were responsible for this error: 1. %config_bool_settings and %config_settings despite similar name have different semantic. %config_bool_settings values are arrays where the first element is (reference to) the variable to set, and second element is default value... which admittedly is a bit cryptic. More readable if more verbose option would be to use hash reference, e.g.: my %config_bool_settings = ( "thread" => { variable => \$thread, default => 1}, [...] %config_settings values are either either reference to scalar variable or reference to array. In second case it means that option (or config option) is multi-valued. BTW. this is similar to what Getopt::Long does. 2. In cec5dae (use new Git::config_path() for aliasesfile, 2011-09-30) the setting "aliasesfile" was moved from %config_settings to newly introduced %config_path_settings. But the loop that parses settings from %config_path_settings was copy'n'pasted *wrongly* from %config_bool_settings instead of from %config_settings. It looks like cec5dae author cargo-culted this change... 3. 994d6c6 (send-email: address expansion for common mailers, 2006-05-14) didn't add test for alias expansion to t9001-send-email.sh Signed-off-by: Cord Seele <cowose@gmail.com> Tested-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-14Merge branch 'maint'Libravatar Junio C Hamano1-0/+5
* maint: t1304: fall back to $USER if $LOGNAME is not defined
2011-10-14t1304: fall back to $USER if $LOGNAME is not definedLibravatar René Scharfe1-0/+5
For some reason $LOGNAME is not set anymore for me after an upgrade from Ubuntu 11.04 to 11.10. Use $USER in such a case. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-13Update draft release notes to 1.7.8Libravatar Junio C Hamano1-1/+40
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-13Merge branch 'js/maint-merge-one-file-osx-expr'Libravatar Junio C Hamano1-1/+1
* js/maint-merge-one-file-osx-expr: merge-one-file: fix "expr: non-numeric argument"
2011-10-13Merge branch 'jn/ident-from-etc-mailname'Libravatar Junio C Hamano2-23/+69
* jn/ident-from-etc-mailname: ident: do not retrieve default ident when unnecessary ident: check /etc/mailname if email is unknown
2011-10-13Merge branch 'il/archive-err-signal'Libravatar Junio C Hamano1-0/+2
* il/archive-err-signal: Support ERR in remote archive like in fetch/push
2011-10-13Merge branch 'jc/grep-untracked-exclude'Libravatar Junio C Hamano3-10/+65
* jc/grep-untracked-exclude: grep: teach --untracked and --exclude-standard options
2011-10-13Merge branch 'rs/diff-cleanup-records-fix'Libravatar Junio C Hamano3-3/+15
* rs/diff-cleanup-records-fix: diff: resurrect XDF_NEED_MINIMAL with --minimal Revert removal of multi-match discard heuristic in 27af01
2011-10-13Merge branch 'rs/pending'Libravatar Junio C Hamano8-49/+64
* rs/pending: commit: factor out clear_commit_marks_for_object_array checkout: use leak_pending flag bundle: use leak_pending flag bisect: use leak_pending flag revision: add leak_pending flag checkout: use add_pending_{object,sha1} in orphan check revision: factor out add_pending_sha1 checkout: check for "Previous HEAD" notice in t2020 Conflicts: builtin/checkout.c revision.c
2011-10-13Merge branch 'jn/no-g-plus-s-on-bsd'Libravatar Junio C Hamano1-0/+1
* jn/no-g-plus-s-on-bsd: Makefile: do not set setgid bit on directories on GNU/kFreeBSD
2011-10-13Merge branch 'jc/is-url-simplify'Libravatar Junio C Hamano1-26/+6
* jc/is-url-simplify: url.c: simplify is_url()
2011-10-13Merge branch 'nd/git-daemon-error-msgs'Libravatar Junio C Hamano1-4/+8
* nd/git-daemon-error-msgs: daemon: return "access denied" if a service is not allowed
2011-10-13Merge branch 'nd/daemon-log-sock-errors'Libravatar Junio C Hamano1-0/+37
* nd/daemon-log-sock-errors: daemon: log errors if we could not use some sockets
2011-10-13Merge branch 'cp/git-web-browse-browsers'Libravatar Junio C Hamano2-5/+71
* cp/git-web-browse-browsers: git-web--browse: avoid the use of eval
2011-10-13Merge branch 'jc/apply-blank-at-eof-fix'Libravatar Junio C Hamano1-2/+9
* jc/apply-blank-at-eof-fix: apply --whitespace=error: correctly report new blank lines at end
2011-10-13Merge branch 'di/fast-import-empty-tag-note-fix'Libravatar Junio C Hamano2-0/+33
* di/fast-import-empty-tag-note-fix: fast-import: don't allow to note on empty branch fast-import: don't allow to tag empty branch
2011-10-13Merge branch 'nd/maint-autofix-tag-in-head'Libravatar Junio C Hamano7-65/+93
* nd/maint-autofix-tag-in-head: Accept tags in HEAD or MERGE_HEAD merge: remove global variable head[] merge: use return value of resolve_ref() to determine if HEAD is invalid merge: keep stash[] a local variable Conflicts: builtin/merge.c
2011-10-13Merge branch 'bw/grep-no-index-no-exclude'Libravatar Junio C Hamano2-4/+4
* bw/grep-no-index-no-exclude: grep --no-index: don't use git standard exclusions grep: do not use --index in the short usage output
2011-10-13Merge branch 'nd/maint-sparse-errors'Libravatar Junio C Hamano2-4/+32
* nd/maint-sparse-errors: Add explanation why we do not allow to sparse checkout to empty working tree sparse checkout: show error messages when worktree shaping fails
2011-10-12Update draft release notes to 1.7.8Libravatar Junio C Hamano1-1/+12
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-12Merge branch 'cb/do-not-pretend-to-hijack-long-help'Libravatar Junio C Hamano6-7/+6
* cb/do-not-pretend-to-hijack-long-help: use -h for synopsis and --help for manpage consistently
2011-10-12Merge branch 'sp/smart-http-failure'Libravatar Junio C Hamano1-1/+8
* sp/smart-http-failure: remote-curl: Fix warning after HTTP failure
2011-10-12Merge branch 'nd/document-err-packet'Libravatar Junio C Hamano1-0/+7
* nd/document-err-packet: pack-protocol: document "ERR" line
2011-10-12Merge branch 'jc/parse-options-boolean'Libravatar Junio C Hamano10-22/+53
* jc/parse-options-boolean: apply: use OPT_NOOP_NOARG revert: use OPT_NOOP_NOARG parseopt: add OPT_NOOP_NOARG archive.c: use OPT_BOOL() parse-options: deprecate OPT_BOOLEAN Conflicts: builtin/revert.c
2011-10-12Merge branch 'rs/test-ctype'Libravatar Junio C Hamano1-58/+22
* rs/test-ctype: test-ctype: add test for is_pathspec_magic test-ctype: macrofy
2011-10-12Merge branch 'rs/name-rev-usage'Libravatar Junio C Hamano1-1/+3
* rs/name-rev-usage: name-rev: split usage string
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 15:52:16 +0000