]>
git.madduck.net Git - code/vcsh.git/log
madduck's git repository
Every one of the projects in this repository is available at the canonical
URL git://git.madduck.net/madduck/pub/<projectpath> — see
each project's metadata for the exact URL.
All patches and comments are welcome. Please squash your changes to logical
commits before using git-format-patch and git-send-email to
patches@ git. madduck. net .
If you'd read over the Git project's submission guidelines and adhered to them,
I'd be especially grateful.
SSH access, as well as push access can be individually
arranged .
If you use my repositories frequently, consider adding the following
snippet to ~/.gitconfig and using the third clone URL listed for each
project:
[url "git://git.madduck.net/madduck/"]
insteadOf = madduck:
Mert Dirik [Tue, 21 Oct 2014 00:08:25 +0000 (03:08 +0300)]
Add checks to file operations
Mert Dirik [Mon, 20 Oct 2014 21:25:43 +0000 (00:25 +0300)]
Force temporary file/directory removal
Mert Dirik [Sun, 19 Oct 2014 00:24:04 +0000 (03:24 +0300)]
3rd try
Richard Hartmann [Fri, 13 Jan 2012 01:07:02 +0000 (02:07 +0100)]
test commit; rewrite to use comm and two temp files to get around argument too long crap
Richard Hartmann [Thu, 12 Jan 2012 23:43:12 +0000 (00:43 +0100)]
test commit
Richard Hartmann [Thu, 12 Jan 2012 23:39:33 +0000 (00:39 +0100)]
test commit
Richard Hartmann [Thu, 9 Oct 2014 21:22:03 +0000 (23:22 +0200)]
Richard Hartmann [Mon, 8 Sep 2014 20:39:14 +0000 (22:39 +0200)]
Merge pull request #139 from yuvallanger/patch-2
README: Using a `repo_name` instead of `foo`
Yuval Langer [Sun, 7 Sep 2014 14:39:22 +0000 (17:39 +0300)]
Rename `foo` to a meaningful name `repo_name`
I get lost within all of those meaningless names.
It is useful to give things meaningful names, especially in documentation.
Richard Hartmann [Sun, 7 Sep 2014 11:14:07 +0000 (13:14 +0200)]
Merge pull request #138 from yuvallanger/patch-1
typo `that you cat track` -> `that you can track`
Yuval Langer [Sun, 7 Sep 2014 08:19:27 +0000 (11:19 +0300)]
typo `that you cat track` -> `that you can track`
Richard Hartmann [Mon, 25 Aug 2014 15:45:12 +0000 (17:45 +0200)]
Makefile: Allow `PREFIX=foo make install`
Richard Hartmann [Sat, 7 Jun 2014 08:22:22 +0000 (10:22 +0200)]
Merge pull request #134 from mirabilos/master
fix issue 125 and some printf vulnerabilities
Richard Hartmann [Fri, 23 May 2014 17:55:51 +0000 (19:55 +0200)]
Merge pull request #135 from ajschumacher/patch-1
typo: "availabile.d" to "available.d"
Aaron Schumacher [Wed, 21 May 2014 20:01:04 +0000 (16:01 -0400)]
typo: "availabile.d" to "available.d"
Thorsten Glaser [Wed, 7 May 2014 08:20:32 +0000 (10:20 +0200)]
Display full paths in list-tracked*
Closes https://github.com/RichiH/vcsh/issues/125
Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
Richard Hartmann [Thu, 8 May 2014 17:58:56 +0000 (19:58 +0200)]
Merge branch 'master' of github.com:RichiH/vcsh
Richard Hartmann [Thu, 8 May 2014 11:46:37 +0000 (13:46 +0200)]
Richard Hartmann [Thu, 8 May 2014 11:42:46 +0000 (13:42 +0200)]
Revert "Introduce static manpage as part of normal repo"
This reverts commit
056f86ae9a3c25fd2e0b74ac6b81d9b0d5630818 .
Conflicts:
vcsh.1
This messes too much with my Debian packaging workflow; I will introduce
a new branch with static manpages (basically what I did for homebrew).
Richard Hartmann [Wed, 7 May 2014 13:07:08 +0000 (15:07 +0200)]
Richard Hartmann [Wed, 7 May 2014 13:04:10 +0000 (15:04 +0200)]
CONTRIBUTORS: Update
Thorsten Glaser [Wed, 7 May 2014 08:20:32 +0000 (10:20 +0200)]
Display full paths in list-tracked*
Closes https://github.com/RichiH/vcsh/issues/125
Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
Thorsten Glaser [Wed, 7 May 2014 08:21:35 +0000 (10:21 +0200)]
Fix format string vulnerabilities
Never pass user input as first argument of printf(1),
similar to how you never do that with printf(3).
Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
Thorsten Glaser [Wed, 7 May 2014 08:21:35 +0000 (10:21 +0200)]
Fix format string vulnerabilities
Never pass user input as first argument of printf(1),
similar to how you never do that with printf(3).
Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
Richard Hartmann [Wed, 7 May 2014 06:39:42 +0000 (08:39 +0200)]
Merge pull request #129 from tfnico/patch-5
Suggest shorter form of vcsh pull
Richard Hartmann [Wed, 7 May 2014 06:38:18 +0000 (08:38 +0200)]
Merge pull request #131 from ghedo/_vcsh
_vcsh: add missing commands
Alessandro Ghedini [Sat, 5 Apr 2014 22:13:14 +0000 (00:13 +0200)]
_vcsh: add missing commands
Richard Hartmann [Sat, 5 Apr 2014 21:48:52 +0000 (23:48 +0200)]
Merge pull request #128 from tfnico/patch-4
Fix ticks and commas
Richard Hartmann [Mon, 31 Mar 2014 11:33:31 +0000 (13:33 +0200)]
Merge pull request #130 from g-raud/master
sh-code portability improvements and fixes
G.raud [Mon, 31 Mar 2014 06:07:55 +0000 (08:07 +0200)]
sh-code portability improvements and fixes
use export without assignment
delete needless quoting (after case, in assignments, ...)
add missing quoting (on the echo command line, ...)
make sure 'test =' is not called with empty arguments
do not call test with more than 4 arguments
Thomas Ferris Nicolaisen [Tue, 25 Mar 2014 21:44:10 +0000 (22:44 +0100)]
Suggest shorter form of vcsh pull
Thomas Ferris Nicolaisen [Mon, 24 Mar 2014 18:01:28 +0000 (19:01 +0100)]
Fix ticks and commas
Richard Hartmann [Mon, 24 Mar 2014 15:12:17 +0000 (16:12 +0100)]
Merge pull request #127 from tfnico/patch-3
Link to doc files
Thomas Ferris Nicolaisen [Mon, 24 Mar 2014 14:30:09 +0000 (15:30 +0100)]
Link to doc files
GitHub markdown supports linking to relative files.
Richard Hartmann [Mon, 24 Mar 2014 13:42:43 +0000 (14:42 +0100)]
README.md: Move into doc/; put in tiny one in place
Hopefully, this makes vcsh less scary
Richard Hartmann [Mon, 24 Mar 2014 09:30:00 +0000 (10:30 +0100)]
Merge branch 'master' of github.com:RichiH/vcsh
Richard Hartmann [Mon, 24 Mar 2014 09:25:41 +0000 (10:25 +0100)]
Move docs to doc/
Richard Hartmann [Sun, 23 Mar 2014 19:55:38 +0000 (20:55 +0100)]
Merge pull request #124 from tfnico/patch-2
Fix a typo and some casing
Thomas Ferris Nicolaisen [Sun, 23 Mar 2014 18:53:29 +0000 (19:53 +0100)]
Fix a typo and some casing
Richard Hartmann [Sun, 16 Mar 2014 20:27:25 +0000 (21:27 +0100)]
CONTRIBUTORS: Update
Richard Hartmann [Sun, 16 Mar 2014 19:32:42 +0000 (20:32 +0100)]
vcsh: Update copyright information
Richard Hartmann [Sun, 16 Mar 2014 19:32:13 +0000 (20:32 +0100)]
Add copyright blurb for https://github.com/RichiH/vcsh/issues/121
Richard Hartmann [Sat, 15 Mar 2014 14:01:44 +0000 (15:01 +0100)]
Merge remote-tracking branch 'andschwa/docs'
Richard Hartmann [Sat, 15 Mar 2014 13:58:30 +0000 (14:58 +0100)]
Merge remote-tracking branch 'jfw/master'
Richard Hartmann [Thu, 13 Mar 2014 21:36:27 +0000 (22:36 +0100)]
Release v1.
20140313
The "Git won the Linux New Media Award for Outstanding contributions
to Open Source" edition.
Richard Hartmann [Thu, 13 Mar 2014 21:35:16 +0000 (22:35 +0100)]
Update manpage
Jeff Fein-Worton [Wed, 12 Mar 2014 05:47:27 +0000 (22:47 -0700)]
Improved post-init-add-origin hook
Added better help text
Added error message if $GITURL unset
Andrew Schwartzmeyer [Fri, 7 Mar 2014 04:43:46 +0000 (20:43 -0800)]
One more
Andrew Schwartzmeyer [Fri, 7 Mar 2014 04:06:35 +0000 (20:06 -0800)]
Various fixes to readme
Richard Hartmann [Wed, 5 Mar 2014 17:06:11 +0000 (18:06 +0100)]
Merge branch 'master' of github.com:RichiH/vcsh
Richard Hartmann [Wed, 5 Mar 2014 17:06:04 +0000 (18:06 +0100)]
Merge branch 'feature/gitattributes'
Conflicts:
vcsh
Richard Hartmann [Tue, 4 Mar 2014 19:32:22 +0000 (20:32 +0100)]
vcsh: Default to not using ~/.gitattributes.d
github: fixes richih/vcsh#111
Richard Hartmann [Thu, 27 Feb 2014 16:27:26 +0000 (17:27 +0100)]
Merge pull request #108 from alerque/master
assorted readme updates and other fixes
Richard Hartmann [Thu, 27 Feb 2014 16:27:26 +0000 (17:27 +0100)]
Merge pull request #108 from alerque/master
assorted readme updates and other fixes
Caleb Maclennan [Wed, 26 Feb 2014 16:44:19 +0000 (18:44 +0200)]
use more portable find syntax
BSD find (e.g. as found on Mac OSX) has more strict rules for parsing
arguments and needs a path. PWD is not assumed as on GNU find.
Caleb Maclennan [Wed, 26 Feb 2014 14:32:07 +0000 (16:32 +0200)]
add install instructions for osx
There are other ways to do this, but this seems to be the most commonly
used and easiest way to get the job done. Alternate methods could be
added but at least having this one will alert folks that using this on
OSX is an option.
Caleb Maclennan [Wed, 26 Feb 2014 12:21:02 +0000 (14:21 +0200)]
refactor install instructions to include myrepos
Since myrepos is so strongly recommended, included it in the distro
specific install instructions. Refactor the Arch Linux instructions
to better reflect most common usage.
Caleb Maclennan [Wed, 26 Feb 2014 11:39:39 +0000 (13:39 +0200)]
update Arch install guide to use stable packages
Encourage the use of the stable packages per disro norms. The devel
packages can be used but they trigger full git clones in many AUR
helpers and are generally a pain if you don't specifically want them for
something. Mention the devel package but update the URLs to point to
the one that uses the normal packaging system.
Caleb Maclennan [Tue, 25 Feb 2014 19:29:27 +0000 (21:29 +0200)]
update readme to reflect upstream project change
The `mr` utilily is now called myrepos upstream and they have a new
website address. Update the links in the readme, reflect the new name
of the project where appropriate, and fix the copy surrounding its
introdiction. The actual command is still `mr`.
Richard Hartmann [Tue, 25 Feb 2014 14:33:55 +0000 (15:33 +0100)]
Merge branch 'feature/IFS'
Jeff Fein-Worton [Sat, 22 Feb 2014 08:33:23 +0000 (00:33 -0800)]
added sample post-init
Richard Hartmann [Sun, 23 Feb 2014 21:20:40 +0000 (22:20 +0100)]
vcsh: $() instead of ``
Richard Hartmann [Sun, 23 Feb 2014 20:52:09 +0000 (21:52 +0100)]
vcsh: Support whitespace in filenames for gitignore
GitHub: fixes RichiH/vcsh#105
Richard Hartmann [Fri, 21 Feb 2014 22:41:29 +0000 (23:41 +0100)]
Merge branch 'feature/gitattributes'
Conflicts:
vcsh
Richard Hartmann [Fri, 21 Feb 2014 20:35:54 +0000 (21:35 +0100)]
Merge branch 'master' of github.com:RichiH/vcsh
Richard Hartmann [Fri, 21 Feb 2014 20:35:16 +0000 (21:35 +0100)]
vcsh: Support per-repo .gitattributes
Richard Hartmann [Fri, 21 Feb 2014 20:29:07 +0000 (21:29 +0100)]
vcsh: Formatting
Richard Hartmann [Fri, 21 Feb 2014 20:27:43 +0000 (21:27 +0100)]
Merge pull request #106 from a-sk/master
Fix typo $XDH_CONFIG_HOME -> $XDG_CONFIG_HOME
Skurikhin Alexander [Wed, 19 Feb 2014 02:47:59 +0000 (05:47 +0300)]
Fix typo $XDH_CONFIG_HOME -> $XDG_CONFIG_HOME
Richard Hartmann [Thu, 13 Feb 2014 22:40:28 +0000 (23:40 +0100)]
Merge branch 'feature/chown'
Richard Hartmann [Thu, 13 Feb 2014 22:32:31 +0000 (23:32 +0100)]
vcsh: Fix up the rest of the (relevant) git calls
Richard Hartmann [Wed, 12 Feb 2014 23:39:21 +0000 (00:39 +0100)]
vcsh: Pass along exit code
If `git foo` exits 13, it would be prudent for vcsh to exit 13, as well.
Start with support for `vcsh pull`.
Richard Hartmann [Sun, 9 Feb 2014 18:08:18 +0000 (19:08 +0100)]
Introduce static manpage as part of normal repo
GitHub: fixes RichiH/vcsh#104
Richard Hartmann [Sat, 8 Feb 2014 16:00:47 +0000 (17:00 +0100)]
doc/sample_hooks/: Cleanups
Richard Hartmann [Sat, 8 Feb 2014 15:30:38 +0000 (16:30 +0100)]
Merge pull request #89 from alerque/master
Add hooks to allow fancy merge handling
Caleb Maclennan [Sun, 20 Oct 2013 01:35:10 +0000 (19:35 -0600)]
add sample hooks that allow cloning over extant files
Cloning a repo over an existing set of files would usually
cause a merge conflict that aborts the process and requires
manual intervention. This pair of hooks handles that case
by manually moving the extant objects out of the way,
completing the checktout, then restoring them to their
original places. The resulting state is a set of unstaged
local changes.
Caleb Maclennan [Sun, 20 Oct 2013 01:11:52 +0000 (19:11 -0600)]
add hooks to enable auto handing of merge conflicts
These hooks before and after the actual checkout process
will enable a pair of hook scripts to automatically handle
conflicts and potentially allow the checkout of repositories
over existing file sets
Richard Hartmann [Tue, 4 Feb 2014 22:16:03 +0000 (23:16 +0100)]
Update CONTRIBUTORS
Dato Simó [Mon, 23 Sep 2013 20:47:43 +0000 (21:47 +0100)]
vcsh: don't allow `clone` to choke on filenames with spaces
By replacing the "for" loop with a "while" loop, it is easy to read
line-oriented output without worrying about spaces. However, now the
loop executes in a subshell, and VCSH_CONFLICT won't be available in
the parent shell. In this case, a trivial, portable solution is to
have the comparison as the last command in the subshell.
Dato Simó [Mon, 23 Sep 2013 21:13:54 +0000 (22:13 +0100)]
vcsh: strip host part from GIT_REMOTE when inferring VCSH_REPO_NAME
`vcsh clone` does:
VCSH_REPO_NAME=$(basename "${GIT_REMOTE}" .git)
Typically, most remote paths will have a non-empty directory component,
so using basename works well in all common cases. However, when doing
something like:
% vcsh clone example.org:repo.git
VCSH_REPO_NAME will be set to "example.org:repo" instead of "repo". This
also happens when using url.<x>.insteadOf, à-la:
% vcsh clone v:repo
Stripping everything up to the first colon in the remote URL fixes the
issue.
N.B.: remote URLs with protocol (e.g. http://, git://, or ssh://) do
not exhibit this problem, and are unaffected by this change.
Conflicts:
vcsh
Richard Hartmann [Tue, 21 Jan 2014 14:56:15 +0000 (15:56 +0100)]
vcsh: Initialize repos with --shared=0600
Configurations and other dotdir content may be highly confidential.
Ensure we're not leaking/exposing information by making vcsh
repositories user-accessible, only.
Thanks to Enrico Zini for realizing this was a problem.
Richard Hartmann [Mon, 6 Jan 2014 02:06:40 +0000 (03:06 +0100)]
Update CONTRIBUTORS
Richard Hartmann [Sun, 29 Dec 2013 16:41:12 +0000 (17:41 +0100)]
.gitignore: Ignore .swp
Opening Vim in $PWD without a file name (think scratch pad) will open
.swp, which is not matched by *.swp
Richard Hartmann [Sun, 29 Dec 2013 16:25:25 +0000 (17:25 +0100)]
sh: Bump version to 1.
20131229 .git-HEAD
Richard Hartmann [Sun, 29 Dec 2013 16:22:24 +0000 (17:22 +0100)]
Richard Hartmann [Sun, 29 Dec 2013 00:54:00 +0000 (01:54 +0100)]
vcsh: Improve comments
Richard Hartmann [Sun, 29 Dec 2013 00:51:14 +0000 (01:51 +0100)]
vcsh: Typo
Mikhail Gusarov [Sat, 28 Dec 2013 16:41:53 +0000 (17:41 +0100)]
Use 'case' sh construct to shorten short commands' recognition
Mikhail Gusarov [Sat, 28 Dec 2013 16:37:44 +0000 (17:37 +0100)]
Use "assign default values" sh feature to simplify defaults handling
Richard Hartmann [Sun, 29 Dec 2013 00:04:49 +0000 (01:04 +0100)]
vcsh: More resilient variable handling for
6b22746e94bf469dd462907fd43d13a454e56ede
Mikhail Gusarov [Sat, 28 Dec 2013 16:31:42 +0000 (17:31 +0100)]
Use sh 'default value' expansion more idiomatic construct
Richard Hartmann [Sat, 28 Dec 2013 15:21:32 +0000 (16:21 +0100)]
README.md: Update Debian install directions
Richard Hartmann [Sat, 28 Dec 2013 15:20:13 +0000 (07:20 -0800)]
Merge pull request #101 from dastergon/add_gentoo_doc
Add Gentoo installation in README
Richard Hartmann [Sat, 28 Dec 2013 14:21:20 +0000 (15:21 +0100)]
vcsh: Improve error message
Richard Hartmann [Sat, 28 Dec 2013 14:17:36 +0000 (15:17 +0100)]
vcsh: Fix mktemp bug
2650689d28f662e147d0be4c3ee248f873dbcc3c introduced a bug:
If we are using a template, GNU mktemp will use PWD instead of $TMPDIR
Richard Hartmann [Thu, 26 Dec 2013 20:23:11 +0000 (21:23 +0100)]
Merge branch 'master' of github.com:RichiH/vcsh
Pavlos Ratis [Tue, 24 Dec 2013 22:33:18 +0000 (00:33 +0200)]
add Gentoo installation in README
Richard Hartmann [Fri, 20 Dec 2013 22:34:54 +0000 (14:34 -0800)]
Merge pull request #98 from dottedmag/fix--echo-n-os-x
Use printf, not echo -n to print messages without newline
Mikhail Gusarov [Wed, 18 Dec 2013 21:23:22 +0000 (22:23 +0100)]
Use printf, not echo -n to print messages without newline
OS X echo does not understand -n and prints it literally
Richard Hartmann [Wed, 18 Dec 2013 13:59:51 +0000 (14:59 +0100)]
Merge branch 'master' of github.com:RichiH/vcsh