Felipe Contreras [Thu, 19 May 2016 23:56:17 +0000 (18:56 -0500)]
test: remove httpd tests that ask for user
Until we figure a way to pass the user correctly.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Thu, 19 May 2016 23:15:06 +0000 (18:15 -0500)]
test: remove cruft
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Thu, 19 May 2016 18:44:36 +0000 (13:44 -0500)]
test: fix ambiguous tracking test
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 18 May 2016 17:52:47 +0000 (12:52 -0500)]
test: fix aliases tests
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Thu, 19 May 2016 00:34:05 +0000 (19:34 -0500)]
Merge tag 'v2.8.0'
Git 2.8
* tag 'v2.8.0': (532 commits)
Git 2.8
Documentation: fix git-p4 AsciiDoc formatting
mingw: skip some tests in t9115 due to file name issues
t1300: fix the new --show-origin tests on Windows
t1300-repo-config: make it resilient to being run via 'sh -x'
config --show-origin: report paths with forward slashes
submodule: fix regression for deinit without submodules
l10n: pt_PT: Update and add new translations
l10n: ca.po: update translation
Git 2.8-rc4
Documentation: fix broken linkgit to git-config
Documentation: use ASCII quotation marks in git-p4
Revert "config.mak.uname: use clang for Mac OS X 10.6"
git-compat-util: st_add4: work around gcc 4.2.x compiler crash
l10n: vi.po (2530t): Update translation
l10n: zh_CN: review for git v2.8.0 l10n round 2
gitk: Follow themed bgcolor in help dialogs
gitk: fr.po: Sync translations with git
gitk: Update French translation (311t)
gitk: Update German translation
...
Felipe Contreras [Wed, 18 May 2016 21:45:18 +0000 (16:45 -0500)]
travis: trivial improvements
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 18 May 2016 21:41:51 +0000 (16:41 -0500)]
travis: fix
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 18 May 2016 21:26:25 +0000 (16:26 -0500)]
travis: improve test selection
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 18 May 2016 21:25:16 +0000 (16:25 -0500)]
test: remote: add test shortcuts
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 18 May 2016 21:05:08 +0000 (16:05 -0500)]
Merge branch 'integration'
* integration: (108 commits)
cherry-pick: copy notes and run hooks
cherry-pick: add --action-name option
builtin: rewrite: add copy_rewrite_notes()
builtin: move run_rewrite_hook() to rewrite.c
cherry-pick: don't store skipped commit
cherry-pick: store rewritten commits
builtin: add rewrite helper
cherry-pick: remember rerere-autoupdate
remote: move tests
travis: add more Mercurial versions
travis: use old versions of hg and hg-git
travis: add cache
travis: test development version of hg
travis: add specific test for hg v3.0
Add Travis CI configuration
revert/cherry-pick: cleanup rerere info on --abort
revert/cherry-pick: add --skip option
revert/cherry-pick: add --quiet option
cherry-pick: add --skip-empty option
cherry-pick: don't barf when there's nothing to do
...
Felipe Contreras [Wed, 18 May 2016 21:03:46 +0000 (16:03 -0500)]
Merge branch 'travis-ci' into integration
* travis-ci:
travis: add more Mercurial versions
travis: use old versions of hg and hg-git
travis: add cache
travis: test development version of hg
travis: add specific test for hg v3.0
Add Travis CI configuration
Felipe Contreras [Wed, 18 May 2016 21:03:46 +0000 (16:03 -0500)]
Merge branch 'fc/cherry-pick' into integration
* fc/cherry-pick:
cherry-pick: copy notes and run hooks
cherry-pick: add --action-name option
builtin: rewrite: add copy_rewrite_notes()
builtin: move run_rewrite_hook() to rewrite.c
cherry-pick: don't store skipped commit
cherry-pick: store rewritten commits
builtin: add rewrite helper
cherry-pick: remember rerere-autoupdate
revert/cherry-pick: cleanup rerere info on --abort
revert/cherry-pick: add --skip option
revert/cherry-pick: add --quiet option
cherry-pick: add --skip-empty option
cherry-pick: don't barf when there's nothing to do
Felipe Contreras [Wed, 18 May 2016 21:03:46 +0000 (16:03 -0500)]
Merge branch 'fc/readme' into integration
* fc/readme:
test: fix README location
Add our own README
Felipe Contreras [Wed, 18 May 2016 21:03:46 +0000 (16:03 -0500)]
Merge branch 'fc/trivial' into integration
* fc/trivial:
add: remove dead code
contrib: svn-fe: fix python shebang
add: avoid yoda condition
config: avoid yoda conditions
doc: trivial cleanup for `git pull`
Felipe Contreras [Wed, 18 May 2016 21:03:46 +0000 (16:03 -0500)]
Merge branch 'fc/fixes' into integration
* fc/fixes:
credential: fix wrong double password prompt
rebase: disable fork-point by default
Silence gcc warnings with -O3
Revert "silence some -Wuninitialized false positives"
Revert "make error()'s constant return value more visible"
version-gen: fix versions
version-gen: cleanup
build: fix installation of scripts
# Conflicts:
# Makefile
Felipe Contreras [Wed, 18 May 2016 21:03:45 +0000 (16:03 -0500)]
Merge branch 'fc/comp/graduate' into integration
* fc/comp/graduate:
completion: graduate out of contrib
Felipe Contreras [Wed, 18 May 2016 21:03:45 +0000 (16:03 -0500)]
Merge branch 'fc/comp/fixes' into integration
* fc/comp/fixes:
Revert "Update documentation occurrences of filename .sh"
completion: prompt: fix for Zsh
completion: zsh: fix for directories with spaces
completion: zsh: improve main function selection
completion: add missing fetch options
completion: bash: cleanup cygwin check
completion: zsh: trivial cleanups
completion: remove zsh hack
completion: zsh: don't hide ourselves
completion: bash: remove zsh wrapper
completion: bash: remove old wrappers
Felipe Contreras [Wed, 18 May 2016 21:03:45 +0000 (16:03 -0500)]
Merge branch 'fc/ruby' into integration
* fc/ruby:
ruby: add simpler option parser
ruby: add useful helpers
ruby: bind log_tree_diff_flush()
ruby: bind diff_tree_sha1()
ruby: bind shortlog()
ruby: add RevInfo and DiffOptions
shortlog: split builtin from common code
shortlog: add missing declaration
ruby: bind read_sha1_file()
ruby: bind find_unique_abbrev()
ruby: bind remote and transport stuff
ruby: bind get_merge_bases()
ruby: add Commit class
ruby: bind get_sha1()
ruby: bind read_ref()/peel_ref()
ruby: bind git_config()
ruby: bind dwim_ref()
ruby: bind setup_git_directory()
ruby: add support for internal ruby programs
Add support for ruby commands
Felipe Contreras [Wed, 18 May 2016 21:03:45 +0000 (16:03 -0500)]
Merge branch 'fc/publish' into integration
* fc/publish:
remote: show published status and help
branch: add quick marker to see published status
sha1_name: add support for @{publish} marks
sha1_name: simplify track finding
branch: display publish branch
push: add --set-publish option
branch: add --set-publish-to option
Add concept of 'publish' branch
t5516 (fetch-push): fix test restoration
Felipe Contreras [Wed, 18 May 2016 21:03:45 +0000 (16:03 -0500)]
Merge branch 'fc/fetch/default' into integration
* fc/fetch/default:
config: add fetch.default=simple to progress mode
fetch: add new fetch.default configuration
Felipe Contreras [Wed, 18 May 2016 21:03:45 +0000 (16:03 -0500)]
Merge branch 'fc/stage' into integration
* fc/stage:
completion: update 'git reset' new stage options
reset: allow --keep with --stage
reset: add --stage and --work options
completion: update --staged options
apply: add --work, --no-work options
apply: add --stage option
submodule: add --staged options
stash: add --stage to pop and apply
stash: add --stage option to save
rm: add --staged option
grep: add --staged option
diff: document --staged
stage: add edit command
Add proper 'stage' command
Felipe Contreras [Wed, 18 May 2016 21:03:45 +0000 (16:03 -0500)]
Merge branch 'fc/update' into integration
* fc/update:
Add new `git update` tool
merge: add --reverse-parents option
commit: support for multiple MERGE_MODE
Felipe Contreras [Wed, 18 May 2016 21:03:45 +0000 (16:03 -0500)]
Merge branch 'fc/config/mode' into integration
* fc/config/mode:
config: add core.mode = progress pseudo-config
Felipe Contreras [Wed, 18 May 2016 21:03:45 +0000 (16:03 -0500)]
Merge branch 'fc/config/mode-next' into integration
* fc/config/mode-next:
Add core.mode configuration
Felipe Contreras [Wed, 18 May 2016 21:03:45 +0000 (16:03 -0500)]
Merge branch 'fc/remote/mainline' into integration
* fc/remote/mainline:
remote: move tests
remote-hg: add missing && chain to tests
remote-hg: avoid deprecated bookmarks.write()
remote-hd: temporarily disable hg-git tests
git-remote-bzr: update to v0.3
git-remote-hg: update to v0.3
Include git-remote-hg and git-remote-bzr
Felipe Contreras [Wed, 18 May 2016 21:03:45 +0000 (16:03 -0500)]
Merge branch 'fc/default-aliases' into integration
* fc/default-aliases:
test: fix aliases
Add more default aliases
Add default aliases
Felipe Contreras [Wed, 18 May 2016 21:03:45 +0000 (16:03 -0500)]
Merge branch 'fc/branch/nice-verbose' into integration
* fc/branch/nice-verbose:
branch: reorganize verbose options
Felipe Contreras [Wed, 18 May 2016 21:03:45 +0000 (16:03 -0500)]
Merge branch 'fc/backports' into integration
* fc/backports:
tests: skip RFC1991 tests for gnupg 2.1
Felipe Contreras [Sun, 9 Jun 2013 19:24:34 +0000 (14:24 -0500)]
cherry-pick: copy notes and run hooks
If no action-name is specified, nothing is done.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sun, 9 Jun 2013 19:24:35 +0000 (14:24 -0500)]
cherry-pick: add --action-name option
So it can be used by other tools (e.g. git rebase), and the right action
is passed to the hooks and notes rewrite stuff.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sun, 9 Jun 2013 19:24:33 +0000 (14:24 -0500)]
builtin: rewrite: add copy_rewrite_notes()
And use it on commit.c.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sun, 9 Jun 2013 19:24:32 +0000 (14:24 -0500)]
builtin: move run_rewrite_hook() to rewrite.c
And use struct rewrite.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sun, 9 Jun 2013 19:24:31 +0000 (14:24 -0500)]
cherry-pick: don't store skipped commit
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sun, 9 Jun 2013 19:24:30 +0000 (14:24 -0500)]
cherry-pick: store rewritten commits
Will be useful for the next commits.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sun, 9 Jun 2013 19:24:29 +0000 (14:24 -0500)]
builtin: add rewrite helper
So that we can load and store rewrites, as well as other operations on a
list of rewritten commits.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sun, 9 Jun 2013 19:24:36 +0000 (14:24 -0500)]
cherry-pick: remember rerere-autoupdate
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 18 May 2016 20:46:41 +0000 (15:46 -0500)]
remote: move tests
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 18 May 2016 20:58:48 +0000 (15:58 -0500)]
test: fix cherry pick rerere
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 18 May 2016 20:46:41 +0000 (15:46 -0500)]
remote: move tests
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 18 May 2016 20:42:31 +0000 (15:42 -0500)]
Merge tag 'v2.7.0'
Git 2.7
* tag 'v2.7.0': (539 commits)
Git 2.7
Git 2.6.5
l10n: de.po: translate 68 new messages
l10n: de.po: improve some translations
Git 2.7-rc3
l10n: ru.po: update Russian translation
l10n: Updated Bulgarian translation of git (2477t,0f,0u)
l10n: ca.po: update translation
l10n: zh_CN: for git v2.7.0 l10n round 2
l10n: sv.po: Update Swedish translation (2477t0f0u)
l10n: sv: Fix bad translation
l10n: fr.po v2.7.0 round 2 (2477t)
Git 2.7-rc2
push: don't mark options of recurse-submodules for translation
l10n: git.pot: v2.7.0 round 2 (2 new, 2 removed)
t1401: test reflog creation for git-symbolic-ref
symbolic-ref: propagate error code from create_symref()
git-p4: reduce number of server queries for fetches
git-p4: support multiple depot paths in p4 submit
Update release notes to 2.7
...
Felipe Contreras [Wed, 18 May 2016 02:00:38 +0000 (21:00 -0500)]
travis: add more Mercurial versions
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Tue, 17 May 2016 23:47:01 +0000 (18:47 -0500)]
travis: use old versions of hg and hg-git
Only for the moment.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 18 May 2016 00:29:00 +0000 (19:29 -0500)]
travis: add cache
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sat, 10 May 2014 05:34:57 +0000 (00:34 -0500)]
travis: test development version of hg
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sun, 4 May 2014 00:55:19 +0000 (19:55 -0500)]
travis: add specific test for hg v3.0
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Fri, 11 Apr 2014 23:12:11 +0000 (18:12 -0500)]
Add Travis CI configuration
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 7 May 2014 00:34:39 +0000 (19:34 -0500)]
revert/cherry-pick: cleanup rerere info on --abort
As we should.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sun, 9 Jun 2013 19:24:28 +0000 (14:24 -0500)]
revert/cherry-pick: add --skip option
Akin to 'am --skip' and 'rebase --skip'.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sun, 9 Jun 2013 19:24:27 +0000 (14:24 -0500)]
revert/cherry-pick: add --quiet option
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sun, 9 Jun 2013 19:24:26 +0000 (14:24 -0500)]
cherry-pick: add --skip-empty option
Pretty much what it says on the tin.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sun, 9 Jun 2013 19:24:25 +0000 (14:24 -0500)]
cherry-pick: don't barf when there's nothing to do
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sun, 11 May 2014 06:55:45 +0000 (01:55 -0500)]
test: fix README location
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sun, 11 May 2014 00:20:19 +0000 (19:20 -0500)]
Add our own README
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Tue, 29 Apr 2014 21:34:19 +0000 (16:34 -0500)]
add: remove dead code
addremove is already 1 by default.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 7 May 2014 10:01:16 +0000 (05:01 -0500)]
contrib: svn-fe: fix python shebang
It's better if all our scripts use the same '/usr/bin/env python'.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Tue, 29 Apr 2014 21:32:04 +0000 (16:32 -0500)]
add: avoid yoda condition
18 is younger than person's age.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sat, 7 Dec 2013 08:31:57 +0000 (02:31 -0600)]
config: avoid yoda conditions
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sat, 10 May 2014 06:06:43 +0000 (01:06 -0500)]
doc: trivial cleanup for `git pull`
The user doesn't need to be burdened with irrelevant details.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Tue, 13 May 2014 14:13:53 +0000 (09:13 -0500)]
credential: fix wrong double password prompt
We shouldn't use ssh-askpass to ask for the user, that causes most tools
to ask for "password: username" followed by "password: password".
Totally confusing for the user.
Instead, use a normal prompt to ask for the user.
Reported-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Tue, 13 May 2014 23:11:58 +0000 (18:11 -0500)]
rebase: disable fork-point by default
It is possible that the upstream branch was at some point in the wrong
commit. The user might do 'git reset --hard' to restore that branch to
the right place, the wrong location is already in the reflog.
If the user tries to do a rebase without arguments the fork-point
feature will be used automatically and the wrong point in the reflog
used as one of the possible heads to check for bases.
This is especially bad when upstream was already in the same place as
the current branch (say upstream was fast-forwarded to topic by
mistake), in which case the rebase would silently ignore all the commits
and reset to upstream. The user would wonder what happened with his
commits, or worst; assume they were already in upstream.
This is a very bad situation we should try to avoid.
We cannot rely on the fact that the reflog will always contain only
good heads, therefore the fork-point should be disabled by default.
The fork-point feature is still useful, but it should be enabled
manually, only when the user knows what he is doing, and that all the
points in the reflog of the upstream branch are desirable.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sun, 11 May 2014 04:07:55 +0000 (23:07 -0500)]
Silence gcc warnings with -O3
Commit
a469a10 (silence some -Wuninitialized false positives) tried to
silence some uninitialized false-positives with a hack. This hack
triggered many more warnings on clang, and eventually gcc 4.9.0 as well.
While more hacks can be used to silence the new warnings, it's much
better to decouple ourselves from such hacks and help the compilers
directly.
We can do that by either initializing the variables, or manually
returning the error value (-1) without depending on error() to do it.
This fixes warnings while compiling with gcc -O3.
parse-options.c: In function ‘get_value’:
parse-options.c:183:24: warning: ‘arg’ may be used uninitialized in this function [-Wmaybe-uninitialized]
*(int *)opt->value = strtol(arg, (char **)&s, 10);
^
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sun, 4 May 2014 06:03:58 +0000 (01:03 -0500)]
Revert "silence some -Wuninitialized false positives"
In recent versions of gcc (4.9.0), we get a few of these:
notes.c: In function ‘notes_display_config’:
notes.c:970:28: warning: right-hand operand of comma expression has no effect [-Wunused-value]
config_error_nonbool(k);
^
Previous commit explains the reason.
This reverts commit
a469a1019352b8efc4bd7003b0bd59eb60fc428c.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Conflicts:
cache.h
parse-options.h
Felipe Contreras [Sun, 4 May 2014 05:53:11 +0000 (00:53 -0500)]
Revert "make error()'s constant return value more visible"
In recent versions of gcc (4.9.0), we get hundreds of these:
advice.c: In function ‘error_resolve_conflict’:
advice.c:79:69: warning: right-hand operand of comma expression has no effect [-Wunused-value]
error("'%s' is not possible because you have unmerged files.", me);
^
The original patch intended to help in situations like this:
if (error(...))
/* do stuff */
However, when there's no conditional statement this gets translated to:
(error(..), 1);
And the right hand of the expression has no effect.
So it looks like gcc is smarter now, and in trying to fix a few warnings
we generated hundreds more.
This reverts commit
e208f9cc7574f5980faba498d0aa30b4defeb34f.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Conflicts:
git-compat-util.h
Felipe Contreras [Mon, 30 Sep 2013 19:08:21 +0000 (14:08 -0500)]
version-gen: fix versions
Virtually all packaging guidelines would prefer 1.8.4~rc1, over
1.8.4.rc1 or 1.8.4-rc1, so it makes sense to use that instead.
In particular, the only packaging we provide, git.spec, generates a
wrong version, because git-1.8.4 < git-1.8.4.rc1, changing to ~rc1 fixes
the problem as it's considered newer.
The same happens in dpkg.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sat, 24 Aug 2013 02:21:16 +0000 (21:21 -0500)]
version-gen: cleanup
No functional changes.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sun, 29 Sep 2013 16:41:07 +0000 (11:41 -0500)]
build: fix installation of scripts
They need the gitexecdir.
Otherwise the child scripts fail when installing:
% make -C contrib/remote-helpers install
install: target ‘$d/libexec/git-core’ is not a directory
Makefile:513: recipe for target 'install-python-script' failed
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sat, 3 May 2014 00:28:16 +0000 (19:28 -0500)]
completion: graduate out of contrib
These have been stable and widely used for quite a long time, they even
have tests outside of the contrib area, and most distributions ship
them, so they can be considered part of the core already.
We should be consistent and either we move the tests to contrib, or we
move the completions out of contrib.
Let's move them out of contrib and install them by default.
By default bash-completion installs the completions to
$(pkgdatadir)/completions, which is
$(prefix)/share/bash-completion/completions. And since most distributions do
not change this, it is obviously the right default. However,
bash-completion recommends to use pkg-config to find the right location,
so we could use that, but it's much easier to let distributions do it:
bashcomdir=$pkg-config --variable=completionsdir bash-completion)
By default zsh looks for completions in
$(prefix)/share/zsh/site-functions.
The distributions use these locations to install Git completions:
ArchLinux: /usr/share/bash-completion/completions/
Debian: /usr/share/bash-completion/completions/
Fedora: /etc/bash_completion.d/
Ubuntu: /usr/share/bash-completion/completions/
Mint: /usr/share/bash-completion/completions/
OpenSuse: /etc/bash_completion.d/
However, in both Fedora and OpenSUSE their bash-completion intallations
use /usr/share/bash-completion/completions/ (they don't change the
default). So it seems to a be a bug from the packager, since they
recommend the bash-completion location[1]
If some weird distribution has a problem with the location, they can
override 'bashcompdir' anyway.
[1] http://article.gmane.org/gmane.linux.redhat.fedora.devel/177405
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 18 May 2016 16:52:49 +0000 (11:52 -0500)]
Revert "Update documentation occurrences of filename .sh"
The original code was correct: the example location ~/.git-completion.sh
is correct, because it's not only used by Bash. And zstyle command in
Zsh should use that same location; the Bash script.
This reverts commit
0e5ed7cca3c51c821c2bb0465617e75d994f432f.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 18 May 2016 10:23:52 +0000 (05:23 -0500)]
completion: prompt: fix for Zsh
We can add colour in Zsh without the need of pcmode.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Tue, 17 May 2016 22:11:45 +0000 (17:11 -0500)]
completion: zsh: fix for directories with spaces
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Thu, 5 Jun 2014 23:15:47 +0000 (18:15 -0500)]
completion: zsh: improve main function selection
Sometimes we want to use the function directly (e.g. _git_checkout), for
example when zsh has the option 'complete_aliases', this way, we can do
something like:
compdef _git gco=git_checkout
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Thu, 5 Jun 2014 22:56:30 +0000 (17:56 -0500)]
completion: add missing fetch options
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 30 Apr 2014 09:32:34 +0000 (04:32 -0500)]
completion: bash: cleanup cygwin check
Avoid Yoda conditions, use test, and cleaner statement.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 30 Apr 2014 09:07:28 +0000 (04:07 -0500)]
completion: zsh: trivial cleanups
We don't need to override IFS, zsh has a native way of splitting by new
lines: the expansion flag (f).
Also, we don't need to split files by ':' or '='; that's only for words.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 30 Apr 2014 09:00:32 +0000 (04:00 -0500)]
completion: remove zsh hack
We don't want to override the 'complete()' function in zsh, which can be
used by bashcomp.
Reported-by: Mark Lodato <lodato@google.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 30 Apr 2014 08:55:49 +0000 (03:55 -0500)]
completion: zsh: don't hide ourselves
There's no need to hide the fact that we are on zsh any more.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 30 Apr 2014 08:48:31 +0000 (03:48 -0500)]
completion: bash: remove zsh wrapper
It has been deprecated for one year and a half. It's time to move on.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 30 Apr 2014 08:50:04 +0000 (03:50 -0500)]
completion: bash: remove old wrappers
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sat, 28 Sep 2013 12:03:38 +0000 (07:03 -0500)]
ruby: add simpler option parser
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sat, 28 Sep 2013 23:23:16 +0000 (18:23 -0500)]
ruby: add useful helpers
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sat, 28 Sep 2013 02:56:30 +0000 (21:56 -0500)]
ruby: bind log_tree_diff_flush()
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sat, 28 Sep 2013 02:56:10 +0000 (21:56 -0500)]
ruby: bind diff_tree_sha1()
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sat, 28 Sep 2013 02:54:39 +0000 (21:54 -0500)]
ruby: bind shortlog()
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sat, 28 Sep 2013 02:53:39 +0000 (21:53 -0500)]
ruby: add RevInfo and DiffOptions
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 25 Sep 2013 15:00:45 +0000 (10:00 -0500)]
shortlog: split builtin from common code
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 25 Sep 2013 14:59:40 +0000 (09:59 -0500)]
shortlog: add missing declaration
Otherwise we would have to include commit.h.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sat, 28 Sep 2013 02:50:02 +0000 (21:50 -0500)]
ruby: bind read_sha1_file()
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sat, 28 Sep 2013 02:46:33 +0000 (21:46 -0500)]
ruby: bind find_unique_abbrev()
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Fri, 27 Sep 2013 23:11:44 +0000 (18:11 -0500)]
ruby: bind remote and transport stuff
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Fri, 27 Sep 2013 22:50:26 +0000 (17:50 -0500)]
ruby: bind get_merge_bases()
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Fri, 27 Sep 2013 22:42:13 +0000 (17:42 -0500)]
ruby: add Commit class
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Fri, 27 Sep 2013 21:40:11 +0000 (16:40 -0500)]
ruby: bind get_sha1()
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Fri, 27 Sep 2013 21:33:17 +0000 (16:33 -0500)]
ruby: bind read_ref()/peel_ref()
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Fri, 27 Sep 2013 20:52:53 +0000 (15:52 -0500)]
ruby: bind git_config()
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Fri, 27 Sep 2013 20:11:08 +0000 (15:11 -0500)]
ruby: bind dwim_ref()
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sat, 28 Sep 2013 06:08:43 +0000 (01:08 -0500)]
ruby: bind setup_git_directory()
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Tue, 24 Sep 2013 00:42:08 +0000 (19:42 -0500)]
ruby: add support for internal ruby programs
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Wed, 12 Jun 2013 23:52:22 +0000 (18:52 -0500)]
Add support for ruby commands
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Sat, 10 May 2014 23:46:44 +0000 (18:46 -0500)]
remote: show published status and help
So when switching branches or doing `git status` we see relevant
information about the publish branch.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Felipe Contreras [Fri, 2 May 2014 04:18:08 +0000 (23:18 -0500)]
branch: add quick marker to see published status
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>