* Re: [ANNOUNCE] Git homepage change
From: Boyd Lynn Gerber @ 2009-01-06 4:24 UTC (permalink / raw)
To: Scott Chacon; +Cc: David Bryson, Mike Hommey, git
In-Reply-To: <d411cc4a0901051749p2ef880bub45bba1c0d41bfc7@mail.gmail.com>
On Mon, 5 Jan 2009, Scott Chacon wrote:
> On Mon, Jan 5, 2009 at 1:27 PM, David Bryson <david@statichacks.org> wrote:
>> On Mon, Jan 05, 2009 at 08:40:11PM +0100 or thereabouts, Mike Hommey wrote:
>>>
>>> FWIW, I think the "mascot" or whatever it is supposed to be, on the
>>> top right end, is "safe", trademark/copyright-wise. It looks too much
>>> like ???????????????(D??mo-kun), the NHK mascot.
>>> http://images.google.co.jp/images?q=%E3%81%A9%E3%83%BC%E3%82%82%E3%81%8F%E3%82%93&ie=UTF-8&oe=UTF-8&hl=en&um=1&sa=N&tab=wi
>>
>> I think Scott mentioned at GitTogether that they paid the same artist
>> design some artwork for them including that tree munching monster and an
>> octopus.
>>
>> Scott do you care to elaborate ?
>
> I bought rights to the image from iStockPhoto, we can use it online
> for whatever we want to. The only restriction is that we can't sell
> stuff with the image on it. I have no idea what NHK is, nor do I know
> how TM/copyright issues would work in this regard - (the site is
> hosted in the US, has NHK registered TM for that here?) - but I doubt
> it really matters. If I get a cease and desist, I'll replace the
> image, but to me it doesn't seem close enough to infringe and I doubt
> they would care.
>
> Btw, I would also like to say in general that the response to this
> from emails sent to me personally (my address is at the bottom of the
> page) has been very positive and I've even received a few patches that
> are now live.
>
> Also, Miklos : your patch changes the format of the output and doesn't
> speed things up or anything, so I'm just sticking with the current
> script for now (unless I'm missing something).
>
> Boyd Gerber: I'm confused - the mailing list archive link on the home
> page points to the Gmane page, which is completely up to date. Is
> there a link I'm missing?
This is the link
You can also ask the Git community directly at our git@vger.kernel.org
mailing list. with the link below.
http://dir.gmane.org/gmane.comp.version-control.git
On this page the following...
Other mailing list archives for this list:
1. The Mail Archive
http://www.mail-archive.com/git@vger.kernel.org/
And this states this link
http://www.mail-archive.com/git@vger.kernel.org/
And the lastest is 2005 and earlier.
--
Boyd Gerber <gerberb@zenez.com> 801 849-0213
ZENEZ 1042 East Fort Union #135, Midvale Utah 84047
^ permalink raw reply
* Re: git-completion.bash missing --help
From: Shawn O. Pearce @ 2009-01-06 4:37 UTC (permalink / raw)
To: jidanni; +Cc: git
In-Reply-To: <877i59nmd1.fsf@jidanni.org>
jidanni@jidanni.org wrote:
> git-completion.bash seems to be missing --help. Hitting TAB just shows e.g.,
> $ git add --<TAB>
> --dry-run --ignore-errors --interactive --patch --refresh --update
> Only for plain
> $ git --<TAB>
> is one able to complete --help.
Adding completion for --help to every command we have long option
completion on is just annoying.
Doesn't it complete "git he<TAB> ad<TAB>"?
--
Shawn.
^ permalink raw reply
* How make "git checkout <commit> <file>" *not* alter index?
From: chris @ 2009-01-06 5:18 UTC (permalink / raw)
To: git
I want to pull an old version of a file into my local directory and make it
appear like work I haven't added to index yet...
So how modify
git checkout <commit> <file>
to do this?
cs
^ permalink raw reply
* Re: git-branch man page contains rendered nroff
From: Jeff King @ 2009-01-06 5:35 UTC (permalink / raw)
To: jidanni; +Cc: git
In-Reply-To: <87hc4dnner.fsf@jidanni.org>
On Tue, Jan 06, 2009 at 11:06:36AM +0800, jidanni@jidanni.org wrote:
> $ make git-branch.1 && man -l git-branch.1|col -b|fgrep .ft|sort|uniq -c
> 2 .ft
> 2 .ft C
It's a toolchain issue. See:
http://thread.gmane.org/gmane.comp.version-control.git/99392
or
http://thread.gmane.org/gmane.comp.version-control.git/72290
-Peff
^ permalink raw reply
* Re: How make "git checkout <commit> <file>" *not* alter index?
From: Jike Song @ 2009-01-06 6:17 UTC (permalink / raw)
To: chris; +Cc: git
In-Reply-To: <20090106051852.GA3278@seberino.org>
On Tue, Jan 6, 2009 at 1:18 PM, <chris@seberino.org> wrote:
> I want to pull an old version of a file into my local directory and make it
> appear like work I haven't added to index yet...
>
>
> So how modify
>
>
> git checkout <commit> <file>
>
> to do this?
I have a stupid way to do this:
$ git show v2.6.12:Makefile > Makefile
$ git diff --cached /* no outputs */
Ugly but seems work.
--
Thanks,
Jike
^ permalink raw reply
* Re: How make "git checkout <commit> <file>" *not* alter index?
From: Junio C Hamano @ 2009-01-06 6:26 UTC (permalink / raw)
To: chris; +Cc: git
In-Reply-To: <20090106051852.GA3278@seberino.org>
chris@seberino.org writes:
> I want to pull an old version of a file into my local directory and make it
> appear like work I haven't added to index yet...
The command to reset the index can be used any time you have unwanted
changes to it and pretend you started from the latest commit (aka HEAD).
Typically, you use it to recover from a "git add" you did by mistake,
e.g.
$ edit frotz.c nitfol.c
$ git add frotz.c nitfol.c
... oops, I do not want the changed frotz.c in the next commit.
$ git reset frotz.c
$ git commit -m 'update nitfol.c for such and such reasons'
This procedure can be used after you have smudged the index in an unwated
way, and is not limited to "git add" (or "git add -p"). In this case, you
can do:
$ git checkout HEAD~43 Makefile
$ git reset Makefile
^ permalink raw reply
* What's cooking in git.git (Jan 2009, #01; Mon, 05)
From: Junio C Hamano @ 2009-01-06 6:33 UTC (permalink / raw)
To: git
What's cooking in git.git (Jan 2009, #01; Mon, 05)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed
with '-' are only in 'pu' while commits prefixed with '+' are
in 'next'. The ones marked with '.' do not appear in any of the branches,
but I am still holding onto them.
The topics list the commits in reverse chronological order. The topics
meant to be merged to the maintenance series have "maint-" in their names.
Sorry to have been lagging a bit. There are a few patches I am interested
in but haven't studied yet nor mentioned here. I've been swamped outside
git lately for the past few days, but hopefully I can get to them shortly.
----------------------------------------------------------------
[New Topics]
* js/bundle-tags (Fri Jan 2 19:08:46 2009 +0100) 1 commit
+ bundle: allow rev-list options to exclude annotated tags
* js/add-not-submodule (Fri Jan 2 19:08:40 2009 +0100) 1 commit
+ git add: do not add files from a submodule
* pb/maint-git-pm-false-dir (Mon Dec 29 01:25:00 2008 +0100) 1 commit
+ Git.pm: correctly handle directory name that evaluates to "false"
* pj/maint-ldflags (Sun Jan 4 21:27:41 2009 -0500) 1 commit
+ configure clobbers LDFLAGS
* fe/cvsserver (Fri Jan 2 16:40:14 2009 +0100) 2 commits
+ cvsserver: change generation of CVS author names
+ cvsserver: add option to configure commit message
* js/maint-bisect-gitk (Fri Jan 2 19:08:00 2009 +0100) 1 commit
+ bisect view: call gitk if Cygwin's SESSIONNAME variable is set
* np/no-loosen-prune-expire-now (Tue Dec 30 14:45:11 2008 -0500) 1 commit
+ objects to be pruned immediately don't have to be loosened
* cb/maint-unpack-trees-absense (Thu Jan 1 21:54:33 2009 +0100) 3 commits
+ unpack-trees: remove redundant path search in verify_absent
+ unpack-trees: fix path search bug in verify_absent
+ unpack-trees: handle failure in verify_absent
* mc/cd-p-pwd (Tue Dec 30 07:10:24 2008 -0800) 1 commit
+ git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on
OS X
All of the above are good fixes and clean-ups; will be fast-tracked to
'master' and maintenance branches as appropriate.
* mv/apply-parse-opt (Sun Dec 28 00:03:57 2008 +0100) 1 commit
+ parse-opt: migrate builtin-apply.
* mh/cherry-default (Thu Jan 1 22:56:29 2009 +0100) 2 commits
+ Documentation: clarify which parameters are optional to git-cherry
+ git-cherry: make <upstream> parameter optional
* rs/maint-shortlog-foldline (Mon Dec 29 23:15:50 2008 +0100) 1 commit
- [Need tidying up the log] pretty: support multiline subjects with
format:
* tr/rebase-root (Fri Jan 2 23:28:29 2009 +0100) 4 commits
- rebase: update documentation for --root
- rebase -i: learn to rebase root commit
- rebase: learn to rebase root commit
- rebase -i: execute hook only after argument checking
I should be able to find time to read this over again and merge to
'next' sometime this week.
* as/autocorrect-alias (Sun Jan 4 18:16:01 2009 +0100) 1 commit
+ git.c: make autocorrected aliases work
* as/commit-signoff (Mon Dec 29 12:16:45 2008 +0100) 1 commit
- [WIP] Add a commit.signoff configuration option to always use --
signoff in commit
----------------------------------------------------------------
[Stalled and may need help and prodding to go forward]
* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits
. In add --patch, Handle K,k,J,j slightly more gracefully.
. Add / command in add --patch
. git-add -i/-p: Change prompt separater from slash to comma
Will discard and wait for a resubmit.
* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
. git-am: Pass the --directory option through to git-apply
A reroll of this by Simon Schubert triggered a series to fix a parameter
propagation bug, and another reroll to add "git am --directory=path/"
should be much easier now. I am not likely to use the feature myself, so
it is up to intrested volunteers to carry it forward.
* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
- autoconf: Enable threaded delta search when pthreads are supported
This automatically enables threaded delta search code when autoconf
detects pthreads are usable. I haven't heard neither positive nor
negative comments from minority platforms that might be harmed, but
this feels like the right thing to do, so perhaps the best course of
action is to merge this down to 'master' and see if anybody screams.
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
+ blame: show "previous" information in --porcelain/--incremental
format
+ git-blame: refactor code to emit "porcelain format" output
This gives Porcelains (like gitweb) the information on the commit _before_
the one that the final blame is laid on, which should save them one
rev-parse to dig further. The line number in the "previous" information
may need refining, and sanity checking code for reference counting may
need to be resurrected before this can move forward.
----------------------------------------------------------------
[Actively cooking]
* nd/grep-assume-unchanged (Sat Dec 27 15:21:03 2008 +0700) 2 commits
+ grep: grep cache entries if they are "assume unchanged"
+ grep: support --no-ext-grep to test builtin grep
* as/maint-shortlog-cleanup (Tue Dec 30 22:01:44 2008 +0100) 1 commit
+ builtin-shortlog.c: use string_list_append(), and don't strdup
unnecessarily
* jc/maint-ls-tree (Wed Dec 31 19:00:50 2008 +0900) 2 commits
+ Document git-ls-tree --full-tree
+ ls-tree: add --full-tree option
* js/notes (Sat Dec 20 13:06:03 2008 +0100) 4 commits
- Add an expensive test for git-notes
- Speed up git notes lookup
- Add a script to edit/inspect notes
- Introduce commit notes
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
- gitweb: Optional grouping of projects by category
- gitweb: Split git_project_list_body in two functions
- gitweb: Modularized git_get_project_description to be more generic
* gb/gitweb-patch (Thu Dec 18 08:13:19 2008 +0100) 4 commits
- gitweb: link to patch(es) view in commit(diff) and (short)log view
- gitweb: add patches view
- gitweb: change call pattern for git_commitdiff
- gitweb: add patch view
----------------------------------------------------------------
[Graduated to "master"]
* cb/mergetool (Fri Dec 12 21:48:41 2008 +0000) 4 commits
+ mergetool: Don't keep temporary merge files unless told to
+ mergetool: Add prompt to continue after failing to merge a file
+ Add -y/--no-prompt option to mergetool
+ Fix some tab/space inconsistencies in git-mergetool.sh
----------------------------------------------------------------
[Will merge to "master" soon]
* mh/maint-sendmail-cc-doc (Mon Dec 29 00:37:25 2008 +0100) 1 commit
+ doc/git-send-email: mention sendemail.cc config variable
* rs/diff-ihc (Sun Dec 28 19:45:32 2008 +0100) 1 commit
+ diff: add option to show context between close hunks
* js/maint-merge-recursive-r-d-conflict (Mon Dec 22 23:10:20 2008 +0100) 1 commit
+ merge-recursive: mark rename/delete conflict as unmerged
* mk/gitweb-feature (Mon Dec 15 22:16:19 2008 -0800) 1 commit
+ gitweb: unify boolean feature subroutines
* cb/merge-recursive-fix (Mon Dec 15 02:41:24 2008 -0800) 3 commits
+ Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-
recursive-fix
+ merge-recursive: do not clobber untracked working tree garbage
+ modify/delete conflict resolution overwrites untracked file
* cb/maint-merge-recursive-fix (Sun Dec 14 19:40:09 2008 -0800) 2 commits
+ merge-recursive: do not clobber untracked working tree garbage
+ modify/delete conflict resolution overwrites untracked file
* wp/add-p-goto (Thu Dec 4 10:22:40 2008 +0000) 2 commits
+ Add 'g' command to go to a hunk
+ Add subroutine to display one-line summary of hunks
* jn/gitweb-blame (Thu Dec 11 01:33:29 2008 +0100) 3 commits
+ gitweb: cache $parent_commit info in git_blame()
+ gitweb: A bit of code cleanup in git_blame()
+ gitweb: Move 'lineno' id from link to row element in git_blame
* mv/um-pdf (Wed Dec 10 23:44:50 2008 +0100) 1 commit
+ Add support for a pdf version of the user manual
* kk/maint-http-push (Tue Dec 23 11:31:15 2008 +0300) 1 commit
+ http-push: support full URI in handle_remote_ls_ctx()
----------------------------------------------------------------
[On Hold]
* nd/narrow (Sun Nov 30 17:54:38 2008 +0700) 17 commits
- wt-status: show sparse checkout info
- Introduce default sparse patterns (core.defaultsparse)
- checkout: add new options to support sparse checkout
- clone: support sparse checkout with --sparse-checkout option
- unpack_trees(): add support for sparse checkout
- unpack_trees(): keep track of unmerged entries
- Introduce "sparse patterns"
- Merge branch 'master' into nd/narrow
- t2104: touch portability fix
- grep: skip files outside sparse checkout area
- checkout_entry(): CE_NO_CHECKOUT on checked out entries.
- Prevent diff machinery from examining worktree outside sparse
checkout
- ls-files: Add tests for --sparse and friends
- update-index: add --checkout/--no-checkout to update
CE_NO_CHECKOUT bit
- update-index: refactor mark_valid() in preparation for new options
- ls-files: add options to support sparse checkout
- Introduce CE_NO_CHECKOUT bit
Will drop shortly, but there may be some other fixes to CE_VALID, like
nd/grep-assume-unchanged topic above, that we may want to resurrect.
* jc/clone-symref-2 (Sat Nov 29 23:38:21 2008 -0800) 7 commits
- clone: test the new HEAD detection logic
- Merge commit 'HEAD@{2}' into HEAD
- upload-pack: send the HEAD information
- clone: find the current branch more explicitly
- connect.c::read_extra_info(): find where HEAD points at
- connect.c::read_extra_info(): prepare to receive more than server
capabilities
- get_remote_heads(): refactor code to read "server capabilities"
An attempt to extend the fetch protocol to make the logic to detect where
HEAD on the origin site points to more robust. Will drop shortly as the
protocol extension was not very popular.
* cc/bisect-replace (Mon Nov 24 22:20:30 2008 +0100) 9 commits
- bisect: add "--no-replace" option to bisect without using replace
refs
- rev-list: make it possible to disable replacing using "--no-
bisect-replace"
- bisect: use "--bisect-replace" options when checking merge bases
- merge-base: add "--bisect-replace" option to use fixed up revs
- commit: add "bisect_replace_all" prototype to "commit.h"
- rev-list: add "--bisect-replace" to list revisions with fixed up
history
- Documentation: add "git bisect replace" documentation
- bisect: add test cases for "git bisect replace"
- bisect: add "git bisect replace" subcommand
Will drop and replace it with the resubmitted series when it comes.
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
- "git push": tellme-more protocol extension
This seems to have a deadlock during communication between the peers.
Will drop shortly.
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
- diff: enable "too large a rename" warning when -M/-C is explicitly
asked for
This would be the right thing to do for command line use,
but gitk will be hit due to tcl/tk's limitation, so I am holding
this back for now.
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
- git-am --forge: add Signed-off-by: line for the author
- git-am: clean-up Signed-off-by: lines
- stripspace: add --log-clean option to clean up signed-off-by:
lines
- stripspace: use parse_options()
- Add "git am -s" test
- git-am: refactor code to add signed-off-by line for the committer
^ permalink raw reply
* JGit vs. Git
From: Vagmi Mudumbai @ 2009-01-06 6:50 UTC (permalink / raw)
To: git
In-Reply-To: <a55cfe9d0901052249v1461c70cp1d89e184cfc05eb9@mail.gmail.com>
Hi,
I am a git and a jgit noob. Be gentle. :-)
1) Is JGit a drop in replacement of Git? In sense, if I were to pack
in an SCM with my app, Can I pack jgit instead of C Git?
2) I noticed that there are no 'add' and 'commit' commands (at least
from the source) in the org.spearce.git.pgm project. I am looking at
the repo.or.cz/egit.git repo. I had a brief look at the
lib/GitIndex.java and lib/Repository.java. GitIndex has the add
methods to add files/entries to the index. I am still stumped on how
commits can be done with JGit. Any help is hugely appreciated.
I am working on Windows with msysGit behind a HTTP Proxy. (Life cant
get worse, I guess.) . I planned on using grit via JRuby but grit uses
fork which is not available on funny platforms like windows. And JRuby
guys do not have any plan on supporting fork even on platforms on
which for is supported. If JGit is a pure Java based implementation of
Git with more or less the same functionality, then my work becomes a
lot easier.
Regards,
Vagmi
^ permalink raw reply
* Error: unable to unlink ... when using "git gc"
From: Johnny Lee @ 2009-01-06 7:00 UTC (permalink / raw)
To: git
Hello Everyone,
I'm new in git, and when I was practicing the tutorial:
http://www.kernel.org/pub/software/scm/git/docs/everyday.html
I've had a problem when using "git gc"
Here is the log:
git@tomato:~/golf$ git gc
Generating pack...
Done counting 121847 objects.
Deltifying 121847 objects...
100% (121847/121847) done
Writing 121847 objects...
100% (121847/121847) done
Total 121847 (delta 62587), reused 121184 (delta 62253)
Pack pack-44320b247756067835f5e4a789c7eb5bcc5266c3 created.
error: unable to unlink .git/objects/16/b14f5da9e2fcd6f3f38cc9e584cef2f3c90ebe
error: unable to unlink .git/objects/a1/f6672f6e5bd90acf16a43fea774ca655a3ab1e
error: unable to unlink .git/objects/a8/5cca5b91cf77e8df731827849308ef6dae4536
error: unable to unlink .git/objects/ae/64c9d0ea558e403acf139f690c804212d490be
error: unable to unlink .git/objects/b3/a4c72ea70a3bb43b1819a0a74268870849a21d
error: unable to unlink .git/objects/db/5ec507a2ed86169e4a31bba1d95067c4f3fac4
error: unable to unlink .git/objects/ef/65ed2454b8dcbf8837595d8881ca42898a491c
error: unable to unlink .git/objects/fb/92c37ccc8bdbf3c70bc3afaf8261cedbc92d71
Removing unused objects 100%...
Done.
While I'm looking at these "unable to unlink" files, it seems they are
read only:
git@tomato:~/golf$ ls -l .git/objects/16/
total 4
-r--r--r-- 1 johnny johnny 26 2009-01-05 09:25
b14f5da9e2fcd6f3f38cc9e584cef2f3c90ebe
Is there anything wrong here?
BTW. I've used git fsck with/without --full, it works fine and no
error is reported.
Thanks for your consideration,
Johnny
--
we all have our crosses to bear
^ permalink raw reply
* Re: Error: unable to unlink ... when using "git gc"
From: Jeff King @ 2009-01-06 7:22 UTC (permalink / raw)
To: Johnny Lee; +Cc: git
In-Reply-To: <488807870901052300y57f59b90rdc03cc47c790b416@mail.gmail.com>
On Tue, Jan 06, 2009 at 03:00:52PM +0800, Johnny Lee wrote:
> While I'm looking at these "unable to unlink" files, it seems they are
> read only:
> git@tomato:~/golf$ ls -l .git/objects/16/
> total 4
> -r--r--r-- 1 johnny johnny 26 2009-01-05 09:25
> b14f5da9e2fcd6f3f38cc9e584cef2f3c90ebe
>
> Is there anything wrong here?
It is normal for objects to be read-only. However, permission to unlink
a file comes from its directory permission. Is .git/objects/16 writable
by you?
-Peff
^ permalink raw reply
* Re: Error: unable to unlink ... when using "git gc"
From: Jeff King @ 2009-01-06 8:03 UTC (permalink / raw)
To: Johnny Lee; +Cc: git
In-Reply-To: <488807870901052352w585da727r6d4a1e4ca4238cab@mail.gmail.com>
[re-adding git@vger; please keep discussion on-list so everyone can
benefit from the result]
On Tue, Jan 06, 2009 at 03:52:12PM +0800, Johnny Lee wrote:
> Thanks Peff, I've checked the permission of .git/objects/16, it's
> created by another user and thus I have no permission to remove it.
>
> In fact, this is coming from a previous bad practice on setting up a
> collaboration repository on a SSH server, here is what I've done so
> far:
> [...]
> 7. Then the user "git" has changed mode for all the files under .git
> to writable.
>
> 8. This time, user "johnny" can push successfully.
If you are going to have multiple users sharing a repository, generally
they should be in the same group and the core.sharedrepository config
option should be set (see "git help config", or the "shared" option to
git-init).
I've never used that personally, though. I have always just used POSIX
ACLs, with a default ACL on each directory giving access to everyone.
E.g. (off the top of my head):
for user in user1 user2 user3; do
setfacl -R -m u:$user:rwX -m d:u:$user:rwX /path/to/repo
done
-Peff
^ permalink raw reply
* Re: Error: unable to unlink ... when using "git gc"
From: Johnny Lee @ 2009-01-06 8:09 UTC (permalink / raw)
To: Jeff King; +Cc: git
In-Reply-To: <20090106080300.GA10079@coredump.intra.peff.net>
Ooops, forgot to cc to the mailing list.
Thanks for your sharing Peff, I'm going to check these stuffs out and
get back with any findings.
Regards,
Johnny
On Tue, Jan 6, 2009 at 4:03 PM, Jeff King <peff@peff.net> wrote:
> [re-adding git@vger; please keep discussion on-list so everyone can
> benefit from the result]
>
> On Tue, Jan 06, 2009 at 03:52:12PM +0800, Johnny Lee wrote:
>
>> Thanks Peff, I've checked the permission of .git/objects/16, it's
>> created by another user and thus I have no permission to remove it.
>>
>> In fact, this is coming from a previous bad practice on setting up a
>> collaboration repository on a SSH server, here is what I've done so
>> far:
>> [...]
>> 7. Then the user "git" has changed mode for all the files under .git
>> to writable.
>>
>> 8. This time, user "johnny" can push successfully.
>
> If you are going to have multiple users sharing a repository, generally
> they should be in the same group and the core.sharedrepository config
> option should be set (see "git help config", or the "shared" option to
> git-init).
>
> I've never used that personally, though. I have always just used POSIX
> ACLs, with a default ACL on each directory giving access to everyone.
> E.g. (off the top of my head):
>
> for user in user1 user2 user3; do
> setfacl -R -m u:$user:rwX -m d:u:$user:rwX /path/to/repo
> done
>
> -Peff
>
--
we all have our crosses to bear
^ permalink raw reply
* Re: [PATCH] gitweb: use href() when generating URLs in OPML
From: Junio C Hamano @ 2009-01-06 8:17 UTC (permalink / raw)
To: Jakub Narebski; +Cc: Giuseppe Bilotta, git, Petr Baudis
In-Reply-To: <200901021409.07695.jnareb@gmail.com>
Thanks, both; applied.
^ permalink raw reply
* Re: [PATCH] bundle: allow rev-list options to exclude annotated tags
From: Junio C Hamano @ 2009-01-06 8:17 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git
In-Reply-To: <alpine.DEB.1.00.0901021725530.27818@racer>
Thanks; queued for maint (and possibly maint-1.6.0).
^ permalink raw reply
* Re: [RESEND PATCH] git add: do not add files from a submodule
From: Junio C Hamano @ 2009-01-06 8:17 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git
In-Reply-To: <alpine.DEB.1.00.0901021715370.27818@racer>
Makes sense, thanks; queued for maint.
^ permalink raw reply
* Re: [CLEANUP PATCH] show <tag>: reuse pp_user_info() instead of duplicating code
From: Junio C Hamano @ 2009-01-06 8:18 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git, gitster
In-Reply-To: <alpine.DEB.1.00.0901021717350.27818@racer>
Thanks.
^ permalink raw reply
* Re: [PATCH] bash: add '--merge' to 'git reset'
From: Junio C Hamano @ 2009-01-06 8:18 UTC (permalink / raw)
To: SZEDER Gábor; +Cc: Shawn O. Pearce, git
In-Reply-To: <1230563146-18958-1-git-send-email-szeder@ira.uka.de>
Thanks; applied.
^ permalink raw reply
* Re: [PATCH] gitweb: suggest name for OPML view
From: Junio C Hamano @ 2009-01-06 8:18 UTC (permalink / raw)
To: Giuseppe Bilotta; +Cc: git, Jakub Narebski, Petr Baudis
In-Reply-To: <1230900570-25324-1-git-send-email-giuseppe.bilotta@gmail.com>
Giuseppe Bilotta <giuseppe.bilotta@gmail.com> writes:
> Suggest opml.xml as name for OPML view by providing the appropriate
> header, consistently with similar usage in project_index view.
>
> Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
I think this makes sense; will apply unless there is any objection.
^ permalink raw reply
* Re: [PATCH] cvsserver: change generation of CVS author names
From: Junio C Hamano @ 2009-01-06 8:18 UTC (permalink / raw)
To: Lars Noschinski; +Cc: Fabian Emmes, git, Frank Lichtenheld, Martin Langhoff
In-Reply-To: <20090104111245.GA7732@lars.home.noschinski.de>
Lars Noschinski <lars@public.noschinski.de> writes:
> Obviously the reported user names change. To the best of my knowledge
> (but I'm just a barely experienced CVS user) those names are not stored
> anywhere on the client and are regenerated by git-cvsserver for every
> request, so even old repositories get the new names for all commits.
Thanks for a clarification. I'll amend the commit log message and queue
the result for 'next'.
commit d500a1ee8fe4424beb7a98e4fa6159677e7569d0
Author: Fabian Emmes <fabian.emmes@rwth-aachen.de>
Date: Fri Jan 2 16:40:14 2009 +0100
cvsserver: change generation of CVS author names
CVS username is generated from local part email address.
We take the whole local part but restrict the character set to the
Portable Filename Character Set, which is used for Unix login names
according to Single Unix Specification v3.
This will obviously report different usernames from existing repositories
for commits with the local part of the author e-mail address that contains
characters outside the PFCS. Hopefully this won't break an old CVS
checkout from an earlier version of git-cvsserver, because the names are
always shown afresh to the CVS clients and not kept on the client side.
Signed-off-by: Fabian Emmes <fabian.emmes@rwth-aachen.de>
Signed-off-by: Lars Noschinski <lars@public.noschinski.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
^ permalink raw reply
* Re: [PATCH] Fix sourcing "test-lib.sh" using dash shell in "t3003-ls-files-narrow-match.sh"
From: Junio C Hamano @ 2009-01-06 8:18 UTC (permalink / raw)
To: Christian Couder; +Cc: Nguyen Thai Ngoc Duy, git
In-Reply-To: <20090105143002.8a369535.chriscool@tuxfamily.org>
Christian Couder <chriscool@tuxfamily.org> writes:
> dash barfs, on my old Ubuntu box, when "test-lib.sh" is sourced
> without "./".
>
> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> ---
> t/t3003-ls-files-narrow-match.sh | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> This patch applies to "pu".
Thanks; I hope you don't mind squashing this in to 'Introduce "sparse
patterns"'.
^ permalink raw reply
* Re: [PATCH v2 tested-v2] git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X
From: Junio C Hamano @ 2009-01-06 8:18 UTC (permalink / raw)
To: Marcel M. Cary; +Cc: git, jnareb, ae, j.sixt, git-dev
In-Reply-To: <1231105649-12998-1-git-send-email-marcel@oak.homeunix.org>
Thanks; queued.
^ permalink raw reply
* Re: [PATCH 2/2] Be consistent in switch usage for tar
From: Junio C Hamano @ 2009-01-06 8:18 UTC (permalink / raw)
To: henrik; +Cc: git
In-Reply-To: <1231169137-32653-3-git-send-email-henrik@austad.us>
Thanks; both patches applied.
^ permalink raw reply
* Re: git-rev-parse --symbolic-abbrev-name
From: Junio C Hamano @ 2009-01-06 8:18 UTC (permalink / raw)
To: Arnaud Lacombe; +Cc: Karl Chen, Miklos Vajna, David Aguilar, Git mailing list
In-Reply-To: <1a69a9d80901041223r1f3d2956ne05996793bb23e97@mail.gmail.com>
"Arnaud Lacombe" <lacombar@gmail.com> writes:
> You'll find hereafter two patches which implements this in
> git-symbolic-ref and git-rev-parse. Feel free to choose the one you
> find the best. If you choose to integrate one of these, tells me and
> I'll do a proper documentation bits and patch submission.
> diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c
> index 81d5a6f..70f4a33 100644
> --- a/builtin-rev-parse.c
> +++ b/builtin-rev-parse.c
> @@ -24,6 +24,7 @@ static int show_type = NORMAL;
>
> #define SHOW_SYMBOLIC_ASIS 1
> #define SHOW_SYMBOLIC_FULL 2
> +#define SHOW_SYMBOLIC_SHORT 3
> static int symbolic;
> static int abbrev;
> static int output_sq;
I think --symbolic-short makes the most sense.
> @@ -125,13 +129,20 @@ static void show_rev(int type, const unsigned char *sha1, const char *name)
> */
> break;
> case 1: /* happy */
> + if (symbolic == SHOW_SYMBOLIC_SHORT) {
> + char *p;
> + p = strrchr(full, (int)'/');
> + if (p != NULL)
> + full = p + 1;
> + }
However, this is not a good way to do it, I suspect. This patch most
likely will be queued to the al/symbolic-short topic branch, but you are
losing information here. You'd probably want to try substings from the
tail of the full name (e.g. symbolic-short, al/symbolic-short,
heads/al/symbolic-short, and finally refs/heads/al/symbolic-short) and
feed them to dwim_ref() and pick the shortest one that yields the same ref
unambiguously, or something like that.
By the way, I do not see why you need to cast '/'.
^ permalink raw reply
* Re: [PATCH v2 resend] git.c: make autocorrected aliases work
From: Junio C Hamano @ 2009-01-06 8:19 UTC (permalink / raw)
To: Adeodato Simó; +Cc: git
In-Reply-To: <1231089361-12619-1-git-send-email-dato@net.com.org.es>
Thanks, queued.
^ permalink raw reply
* Re: [PATCH 3/3] unpack-trees: remove redundant path search in verify_absent
From: Junio C Hamano @ 2009-01-06 8:19 UTC (permalink / raw)
To: Clemens Buchacher; +Cc: git
In-Reply-To: <1230843273-11056-4-git-send-email-drizzd@aon.at>
Clemens Buchacher <drizzd@aon.at> writes:
> Since the only caller, verify_absent, relies on the fact that o->pos
> points to the next index entry anyways, there is no need to recompute
> its position.
I suspect that the original reasoning of this behaviour might have been in
anticipation of other callers, but I agree with your reasoning especially
because I do not think of a good reason to want to receive the number of
entries to skip as the return value and not have o->pos pointing at the
right place.
Thanks, queued.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox