- 18 10月, 2011 1 次提交
-
-
由 Junio C Hamano 提交于
2c5c66be (Merge branch 'jp/get-ref-dir-unsorted', 2011-10-10) merged a topic that forked from the mainline before a new helper function get_packed_refs() refactored code to read packed-refs file. The merge made the call to the helper function with an incorrect argument. The parameter to the function has to be a path to the submodule. Fix the mismerge. Helped-by: NMark Levedahl <mlevedahl@gmail.com> Helped-by: NMichael Haggerty <mhagger@alum.mit.edu> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 17 10月, 2011 1 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 16 10月, 2011 21 次提交
-
-
git://repo.or.cz/git-gui由 Junio C Hamano 提交于
* 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'
-
由 Michael Olson 提交于
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: NMichael Olson <mwolson@gnu.org> Acked-by: NEric Wong <normalperson@yhbt.net>
-
由 Frédéric Heitzmann 提交于
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: NEric Wong <normalperson@yhbt.net> Signed-off-by: NFrédéric Heitzmann <frederic.heitzmann@gmail.com>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* ms/patch-id-with-overlong-line: patch-id.c: use strbuf instead of a fixed buffer
-
由 Junio C Hamano 提交于
* jc/maint-bundle-too-quiet: Teach progress eye-candy to fetch_refs_from_bundle()
-
由 Junio C Hamano 提交于
* jk/filter-branch-require-clean-work-tree: filter-branch: use require_clean_work_tree
-
由 Junio C Hamano 提交于
* jc/maint-fsck-fwrite-size-check: fsck: do not abort upon finding an empty blob
-
由 Junio C Hamano 提交于
* 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
-
由 Junio C Hamano 提交于
* jk/maint-fetch-submodule-check-fix: fetch: avoid quadratic loop checking for updated submodules
-
由 Junio C Hamano 提交于
* tr/mergetool-valgrind: Symlink mergetools scriptlets into valgrind wrappers
-
由 Junio C Hamano 提交于
* nm/grep-object-sha1-lock: grep: Fix race condition in delta_base_cache Conflicts: builtin/grep.c
-
由 Junio C Hamano 提交于
* 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
-
由 Junio C Hamano 提交于
* 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
-
由 Junio C Hamano 提交于
* jc/grep-untracked-exclude: grep: fix the error message that mentions --exclude
-
由 Junio C Hamano 提交于
* jc/maint-grep-untracked-exclude: grep: fix the error message that mentions --exclude Conflicts: builtin/grep.c
-
由 Bert Wesarg 提交于
Missing rename from --exclude to --standard-exclude. Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Bert Wesarg 提交于
The view jumps now to the given line number after each key press. Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
-
由 Bert Wesarg 提交于
Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
-
由 Bert Wesarg 提交于
Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
-
- 15 10月, 2011 4 次提交
-
-
由 Bert Wesarg 提交于
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: NBert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
-
由 Cord Seele 提交于
cec5dae8 (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 cec5dae8 (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 cec5dae8 author cargo-culted this change... 3. 994d6c66 (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: NCord Seele <cowose@gmail.com> Tested-by: NMichael J Gruber <git@drmicha.warpmail.net> Signed-off-by: NJakub Narebski <jnareb@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: t1304: fall back to $USER if $LOGNAME is not defined
-
由 René Scharfe 提交于
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: NRene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 14 10月, 2011 13 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* js/maint-merge-one-file-osx-expr: merge-one-file: fix "expr: non-numeric argument"
-
由 Junio C Hamano 提交于
* jn/ident-from-etc-mailname: ident: do not retrieve default ident when unnecessary ident: check /etc/mailname if email is unknown
-
由 Junio C Hamano 提交于
* il/archive-err-signal: Support ERR in remote archive like in fetch/push
-
由 Junio C Hamano 提交于
* jc/grep-untracked-exclude: grep: teach --untracked and --exclude-standard options
-
由 Junio C Hamano 提交于
* rs/diff-cleanup-records-fix: diff: resurrect XDF_NEED_MINIMAL with --minimal Revert removal of multi-match discard heuristic in 27af01
-
由 Junio C Hamano 提交于
* 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
-
由 Junio C Hamano 提交于
* jn/no-g-plus-s-on-bsd: Makefile: do not set setgid bit on directories on GNU/kFreeBSD
-
由 Junio C Hamano 提交于
* jc/is-url-simplify: url.c: simplify is_url()
-
由 Junio C Hamano 提交于
* nd/git-daemon-error-msgs: daemon: return "access denied" if a service is not allowed
-
由 Junio C Hamano 提交于
* nd/daemon-log-sock-errors: daemon: log errors if we could not use some sockets
-
由 Junio C Hamano 提交于
* cp/git-web-browse-browsers: git-web--browse: avoid the use of eval
-
由 Junio C Hamano 提交于
* jc/apply-blank-at-eof-fix: apply --whitespace=error: correctly report new blank lines at end
-