* Re: Can `git config` override entries in .gitconfig?
From: Johan Herland @ 2008-12-23 17:59 UTC (permalink / raw)
To: Nicholas LaRoche; +Cc: git
In-Reply-To: <4950D41A.5050009@vt.edu>
On Tuesday 23 December 2008, Nicholas LaRoche wrote:
> Is there a direct way to change the user.email entry for a git
> repository for one user (applied to all previous commits)?
>
> I tried `git config --unset user.email` followed by `git config
> user.email email2` but it just sets a second field called user.email
> that shows up in `git config -l` as a duplicate. My ~/.gitconfig file
> contains email1 for the user.email entry.
>
> Also, when the repository is created can I specify a second set of
> contact information (i.e. using a project specific email) which isn't a
> part of ~/.gitconfig?
>
> output of `git config -l`:
> user.email=email1
> ..
> ..
> user.email=email2
Hi,
Use git-config's --global option to set options in your ~/.gitconfig.
Otherwise, your config changes are stored in the current repo's config
(.git/config).
In your case, when you did `git config --unset user.email`, you unset the
(non-existing) user.email in your repo config, without touching the one in
~/.gitconfig, and when you did `git config user.email email2`, you set
user.email in the repo config (without changing the one in your
~/.gitconfig).
Although `git config -l` displays options from both ~/.gitconfig and the
repo config, AFAIK the repo config does _override_ the ~/.gitconfig, so
when you have user.email set in both, your new commits will use the one in
the repo config (i.e. "email2").
As for rewriting your email address in all previous commits, that is
impossible to do without rewriting your entire history. Rewriting your
history is probably not something you want to do if you have published your
repo, and other people have started working on top of your commits. If you
_do_ want to rewrite your history, you should look at the "git
filter-branch" command.
Have fun!
...Johan
--
Johan Herland, <johan@herland.net>
www.herland.net
^ permalink raw reply
* Re: Question with git push
From: demerphq @ 2008-12-23 17:37 UTC (permalink / raw)
To: Paul Vincent Craven; +Cc: git
In-Reply-To: <5591393c0812230859n3b50b1f9k36153f40dd75ff57@mail.gmail.com>
2008/12/23 Paul Vincent Craven <paul@cravenfamily.com>:
> If I do a 'git push' to another repository, my changes are reverted
> the next time that repository is updated, unless I do a hard reset on
> the remote repository first.
Or just git checkout -f
> Of course, then I would lose my changes
> in the remote repository. What is the correct way of handling this?
I think the general practice is not to push to non-bare repositories
unless you and the owner of the repository can coordinate things. This
either means you push and then tell them, or they set up a
post-receive hook (and understand the consequences of doing so). Of
course often you are both of these people and coordination is easy.
The post-receive hook would go in .git/hooks and would effectively execute:
git checkout -f
on push. However this also means that the working directory will be
unilaterally updated every time someone pushes. Not something you want
to do in a truely shared non-bare repo.
Yves
--
perl -Mre=debug -e "/just|another|perl|hacker/"
^ permalink raw reply
* Re: Question with git push
From: Peter Harris @ 2008-12-23 17:35 UTC (permalink / raw)
To: Paul Vincent Craven; +Cc: git
In-Reply-To: <5591393c0812230859n3b50b1f9k36153f40dd75ff57@mail.gmail.com>
On Tue, Dec 23, 2008 at 11:59 AM, Paul Vincent Craven wrote:
> If I do a 'git push' to another repository, my changes are reverted
> the next time that repository is updated, unless I do a hard reset on
> the remote repository first. Of course, then I would lose my changes
> in the remote repository. What is the correct way of handling this?
Pull from the other side, or push to a branch that you never check
out. Better yet, push to a bare (no work tree) repo you can pull from
both sides.
http://git.or.cz/gitwiki/GitFaq#head-b96f48bc9c925074be9f95c0fce69bcece5f6e73
Peter Harris
^ permalink raw reply
* Re: What's cooking in git.git (Dec 2008, #03; Sun, 21)
From: Jeff King @ 2008-12-23 17:34 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Junio C Hamano, git
In-Reply-To: <alpine.DEB.1.00.0812231746250.30769@pacific.mpi-cbg.de>
On Tue, Dec 23, 2008 at 05:52:54PM +0100, Johannes Schindelin wrote:
> However, note that without something like core.notesref you will never be
> able to have private and public notes.
>
> And I very much want to have private notes _and_ public notes on the very
> same commits of the very same branches.
Right. I think core.notesref doesn't go far enough, because it doesn't
provide a way to talk about notes from two sources at the same time.
Like:
git log --pretty=format:'%N(my-private-notes:foo) %N(public-notes:bar)'
> I just wanted to fiddle a little bit with profiling, as I really do not
> understand why the new notes perform that badly against the old notes,
> even allowing for reading a complete, possibly huge tree into a hashmap.
I haven't looked closely at the latest series yet, so I can't comment.
> And while I am almost sure that there is a stupid bug lurking that will
> kick the performance again, I think the basic design is sound, and it
> should be easy to modify no matter which way you want to change the
> behavior with regards to trees/blobs or refs.
I agree that the data structure is sound, so I can probably work on top
of what you posted, too. I was planning on doing git-notes in C, though.
-Peff
^ permalink raw reply
* Re: Installing git docs in Cygwin.
From: Pascal Obry @ 2008-12-23 17:06 UTC (permalink / raw)
To: Tim Visher; +Cc: git@vger.kernel.org
In-Reply-To: <c115fd3c0812230639v78cee30cqbc7303b02633c8d1@mail.gmail.com>
Le 23 déc. 08 à 15:39, "Tim Visher" <tim.visher@gmail.com> a écrit :
> working fine but when I do a `make
> install-doc`, all of the pages compile fine but then make exits after
> exiting git/Documentation with an `Error 2`.
>
> Thoughts?
Are you sure the docs were built fine. I had to revert to a previous
version of asciidoc. Just an hint.
Pascal.
^ permalink raw reply
* Question with git push
From: Paul Vincent Craven @ 2008-12-23 16:59 UTC (permalink / raw)
To: git
If I do a 'git push' to another repository, my changes are reverted
the next time that repository is updated, unless I do a hard reset on
the remote repository first. Of course, then I would lose my changes
in the remote repository. What is the correct way of handling this?
A quick example:
mkdir -p RepositoryA/files RepositoryB
cd RepositoryA/files
echo "Test file" > test1.txt
git init
git add .
git commit -a -m "Test Commit 1"
cd ../../RepositoryB
git clone ../RepositoryA/files
cd files
# I want this change to go to RepositoryA
echo "More data" >> test1.txt
git add .
git commit -a -m "Test Commit 2"
git push ../../RepositoryA/files
cd ../../RepositoryA/files
echo "Test file" > test2.txt
git add .
# This commit reverts test1.txt to not have "More data"
git commit -a -m "Test Commit 3" # This reverts test1.txt to not
git diff master^ master
How do I change my commands so I keep the change I made in RepositoryB?
Thanks,
--
Paul Vincent Craven
--
Paul Vincent Craven
http://www.cravenfamily.com
^ permalink raw reply
* Re: What's cooking in git.git (Dec 2008, #03; Sun, 21)
From: Johannes Schindelin @ 2008-12-23 16:52 UTC (permalink / raw)
To: Jeff King; +Cc: Junio C Hamano, git
In-Reply-To: <20081223163811.GA25658@coredump.intra.peff.net>
Hi,
On Tue, 23 Dec 2008, Jeff King wrote:
> On Tue, Dec 23, 2008 at 05:26:01PM +0100, Johannes Schindelin wrote:
>
> > > I haven't had much time to really look at this closely, and I probably
> > > won't for another week or so due to the holidays. But from my cursory
> > > examination, I think I want to propose something that is a bit
> > > different.
> >
> > Could you be a bit more, like, specific, please?
>
> The way that GIT_NOTES_REF and core.notesref work aren't what I had in
> mind. I imagined something more amenable to having lots of different
> metadata notes. Refer to the other messages I have written on "naming".
Unfortunately, there were way too many messages between you and Govind,
with not enough new stuff that could interest me, so I had to stop reading
them to avoid depleting my Git time budget each and every single day.
However, note that without something like core.notesref you will never be
able to have private and public notes.
And I very much want to have private notes _and_ public notes on the very
same commits of the very same branches.
> I don't want to hold up progress, so if people want those patches in
> "next", then go for it. What I really meant by my email was that I think
> my suggested changes might be simpler to see as a re-roll rather than
> patches on top, but since I can't work on them for a while, I didn't
> want Junio to take silence as "OK, nobody has complained, so it's time
> for this to graduate to next." But again, if people are ready to start
> playing with this and building on top of it, then I don't want to stand
> in the way.
I just wanted to fiddle a little bit with profiling, as I really do not
understand why the new notes perform that badly against the old notes,
even allowing for reading a complete, possibly huge tree into a hashmap.
And while I am almost sure that there is a stupid bug lurking that will
kick the performance again, I think the basic design is sound, and it
should be easy to modify no matter which way you want to change the
behavior with regards to trees/blobs or refs.
Of course, I'd like Miklos' read-tree bug solved before any more work is
done on notes, since we are in -rc4 after all, and that is a potentially
pretty serious bug.
Ciao,
Dscho
^ permalink raw reply
* Re: What's cooking in git.git (Dec 2008, #03; Sun, 21)
From: Jeff King @ 2008-12-23 16:38 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Junio C Hamano, git
In-Reply-To: <alpine.DEB.1.00.0812231725270.30769@pacific.mpi-cbg.de>
On Tue, Dec 23, 2008 at 05:26:01PM +0100, Johannes Schindelin wrote:
> > I haven't had much time to really look at this closely, and I probably
> > won't for another week or so due to the holidays. But from my cursory
> > examination, I think I want to propose something that is a bit
> > different.
>
> Could you be a bit more, like, specific, please?
The way that GIT_NOTES_REF and core.notesref work aren't what I had in
mind. I imagined something more amenable to having lots of different
metadata notes. Refer to the other messages I have written on "naming".
I don't want to hold up progress, so if people want those patches in
"next", then go for it. What I really meant by my email was that I think
my suggested changes might be simpler to see as a re-roll rather than
patches on top, but since I can't work on them for a while, I didn't
want Junio to take silence as "OK, nobody has complained, so it's time
for this to graduate to next." But again, if people are ready to start
playing with this and building on top of it, then I don't want to stand
in the way.
-Peff
^ permalink raw reply
* Re: What's cooking in git.git (Dec 2008, #03; Sun, 21)
From: Johannes Schindelin @ 2008-12-23 16:26 UTC (permalink / raw)
To: Jeff King; +Cc: Junio C Hamano, git
In-Reply-To: <20081223120534.GA21633@coredump.intra.peff.net>
Hi,
On Tue, 23 Dec 2008, Jeff King wrote:
> On Sun, Dec 21, 2008 at 04:23:22AM -0800, Junio C Hamano wrote:
>
> > * 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
>
> I haven't had much time to really look at this closely, and I probably
> won't for another week or so due to the holidays. But from my cursory
> examination, I think I want to propose something that is a bit
> different.
Could you be a bit more, like, specific, please?
Ciao,
Dscho
^ permalink raw reply
* Re: [PATCH] merge-recursive: mark rename/delete conflict as unmerged
From: Johannes Schindelin @ 2008-12-23 16:20 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Constantine Plotnikov, git, Alex Riesen
In-Reply-To: <7v7i5rhkix.fsf@gitster.siamese.dyndns.org>
Hi,
On Mon, 22 Dec 2008, Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > When a file was renamed in one branch, but deleted in the other, one
> > should expect the index to contain an unmerged entry, namely the
> > target of the rename. Make it so.
>
> That was quick, but the surrounding code makes me wonder if other
> if/elseif branches also need similar handling.
I tried to make sure that the surrounding code also adds unmerged entries,
but I have to admit that my focus lay with the bug report at hand.
> For example, rename/add comes up with a new name that does not exist
> anywhere, and adds both to the index; it is understandable that you need
> to do this when processing a merge with non-zero depth because you need
> to have a tree as the result, but shouldn't the final zero depth merge
> just use the original names and leave the results in higher stages?
Hmm. I think this is a different issue (if you mean the issue that the
result might be named differently than expected).
As for the unmerged entries, no, I do not think we need to do anything
else besides calling update_file() and set try_merge = 1.
After all, if a file was renamed in one branch, but added directly in
another, does it need to conflict? I'd say no.
Ciao,
Dscho
^ permalink raw reply
* Re: Questions about repo and git submodule
From: Shawn O. Pearce @ 2008-12-23 15:29 UTC (permalink / raw)
To: Emily Ren; +Cc: Git Mailinglist
In-Reply-To: <856bfe0e0812230601m1765b483pe62c7902849e9cea@mail.gmail.com>
Emily Ren <lingyan.ren@gmail.com> wrote:
>
> I have some questions about android repo and git submodule.
>
> I created a repo repository with below commands:
> 1. repo init -u git://android.git.kernel.org/platform/manifest.git
> 2. repo initialized in /android
>
> 1. The android dir is not a git repository,
Correct, it is not a git repository. The repo tool does not use
git submodules. The top level of a repo client has a ".repo/"
directory with metadata, not a ".git/" directory. The table of
contents (the subprojects) is stored in XML files under ".repo/".
<aside>
I actually fought against the XML format for repo's manifest, but
others felt it was suitable. And then walked away from the project
after Android open-sourced its code tree. Leaving me to maintain it.
I see a file format simplification in the future for repo.
</aside>
> if other people clone my
> android code, how does it work?
Sadly this isn't supported correctly. You can't initialize one
repo client from another, even though you can git clone one git
repository from any other. Its a bug in repo's design. The data
under ".repo/projects/" isn't laid out correctly to permit reuse
of one repo client to initialize another.
Its something I keep meaning to fix, but its going to take some
real effort.
In the mean time, there is a "--mirror" flag to repo init
which can be used to clone everything into bare repositories.
Those bare repositories can be published for others to repo init
from, though you need to customize the manifest.git:default.xml
so that the embedded URL refers back to your server and not
android.git.kernel.org. Yet another thing I want to fix.
> 2. I want to make android dir to be a git repository, is it workable
> that I create submodule for each subdirectory in another directory? Is
> there a script for it?
You might be able to do something like this:
cd /android
git init
repo forall -c 'cd /android && git submodule add `pwd`'
Also, you might want to consider asking questions related to repo
on the repo-discuss@googlegroups.com mailing list. There's a lot
more repo users there than on the git mailing list, and they have
started to come up with their own "tips n tricks".
--
Shawn.
^ permalink raw reply
* Re: git-cvsimport fuzzy commit log matching?
From: Christoph Hellwig @ 2008-12-23 15:16 UTC (permalink / raw)
To: Martin Langhoff; +Cc: Matthias Urlichs, git
In-Reply-To: <46a038f90812230453m4122e018l2cc22be3f40ab630@mail.gmail.com>
On Tue, Dec 23, 2008 at 10:53:42AM -0200, Martin Langhoff wrote:
> What you could do is
>
> 1 - run cvsps with export to a file (I've posted in this list how to
> run it exactly as cvsimport does)
> 2 - post-process cvsps ouput with perl (there's a parser already in
> cvsimport ;-) )
> 3 - run cvsimport with the post-processed file
>
> Or postprocess the imported git tree as others have suggested.
Instead of post-processing I hacked cvsps. It already has a different
way to detect changesets when running in --bkcvs mode, and re-using that
one for ptools works great.
^ permalink raw reply
* Re: [announce] gc
From: Mike Ralphson @ 2008-12-23 15:06 UTC (permalink / raw)
To: Stephen Haberman; +Cc: Matthieu Moy, git
In-Reply-To: <20081223082207.f31ab2a3.stephen@exigencecorp.com>
2008/12/23 Stephen Haberman <stephen@exigencecorp.com>
>
> > You should find a better name. I mean, one for which
> >
> > http://www.google.com/search?q=git+YOUR-NAME-HERE
> >
> > has a chance to find you ...
>
> Ah, good point.
>
> Perhaps "git corporate hooks" or "git enterprise hooks".
>
> I'm a little cautious about using words like corporate/enterprise as
> there is nothing exclusively "corporate/enterprise" about any of the
> hooks in the project, we just happened to be on a corporate/enterprise
> project when we came up with them.
As the workflows these seem to support are centralised (as you say
these apply equally well in some non-corporate / enterprise projects),
how about git-central?
Mike
^ permalink raw reply
* Re: [RFC] Automagic patch merge ack emails
From: Richard Hartmann @ 2008-12-23 14:46 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7v8wq8hs34.fsf@gitster.siamese.dyndns.org>
On Mon, Dec 22, 2008 at 21:29, Junio C Hamano <gitster@pobox.com> wrote:
> The only time that it may make a difference to you is when things are
> pushed out to the public repository, and there is a mechanism for
> automating tasks after new commits hits the public repository: the
> post-receive hook. contrib/hooks/post-receive-email may be a good example
> to study if you are interested (I use it in my day job repository, but I
> do not use the hook in git.git because the style of announcing I adopted
> on this list is to send out "What's in/cooking" messages once or twice a
> week).
That's pretty much what I meant, yes. As to the rest, I am still thinking
too much in VCS, not DVCS, style, I guess.
Thanks for your clarification, it all makes sense, now :)
Richard
^ permalink raw reply
* Installing git docs in Cygwin.
From: Tim Visher @ 2008-12-23 14:39 UTC (permalink / raw)
To: git
Hey Everyone,
I was wondering if anyone has been able to install the git docs on
Windows under Cygwin? I just ran a successful compile of the core
software and everything seems to be working fine but when I do a `make
install-doc`, all of the pages compile fine but then make exits after
exiting git/Documentation with an `Error 2`.
Thoughts?
--
In Christ,
Timmy V.
http://burningones.com/
http://five.sentenc.es/ - Spend less time on e-mail
^ permalink raw reply
* [PATCH TOPGIT] tg export (quilt): Implement numbering the patches
From: Uwe Kleine-König @ 2008-12-23 14:32 UTC (permalink / raw)
To: git; +Cc: martin f. krafft, Petr Baudis
In-Reply-To: <1230042744-24675-2-git-send-email-u.kleine-koenig@pengutronix.de>
To ease sending patches, with -n each patch gets a number prefix similar
to git format-patch.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
tg-export.sh | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/tg-export.sh b/tg-export.sh
index 06b9c8d..7a7d87a 100644
--- a/tg-export.sh
+++ b/tg-export.sh
@@ -8,6 +8,7 @@ branches=
output=
driver=collapse
flatten=false
+numbered=false
## Parse options
@@ -19,6 +20,9 @@ while [ -n "$1" ]; do
branches="$1"; shift;;
-f)
flatten=true;;
+ -n)
+ flatten=true;
+ numbered=true;;
--quilt)
driver=quilt;;
--collapse)
@@ -37,6 +41,9 @@ done
[ -z "$branches" -o "$driver" = "quilt" ] ||
die "-b works only with the quilt driver"
+[ "$driver" = "quilt" ] || ! "$numbered" ||
+ die "-n works only with the quilt driver";
+
[ "$driver" = "quilt" ] || ! "$flatten" ||
die "-f works only with the quilt driver"
@@ -155,18 +162,26 @@ quilt()
fi;
fi;
- filename="$output/$dn$bn";
- if [ -e "$filename" ]; then
+ if [ -e "$playground/$_dep" ]; then
# We've already seen this dep
return
fi
+ mkdir -p "$playground/$(dirname "$_dep")";
+ touch "$playground/$_dep";
+
if branch_empty "$_dep"; then
echo "Skip empty patch $_dep";
else
+ if "$numbered"; then
+ number="$(printf "%04u" $(($(cat "$playground/^number" 2>/dev/null) + 1)))";
+ bn="$number-$bn";
+ echo "$number" >"$playground/^number";
+ fi;
+
echo "Exporting $_dep"
mkdir -p "$output/$dn";
- $tg patch "$_dep" >"$filename"
+ $tg patch "$_dep" >"$output/$dn$bn"
echo "$dn$bn -p1" >>"$output/series"
fi
}
--
1.5.6.5
^ permalink raw reply related
* [PATCH TOPGIT] tg export: Implement flattening patch paths for quilt mode
From: Uwe Kleine-König @ 2008-12-23 14:32 UTC (permalink / raw)
To: git; +Cc: martin f. krafft, Petr Baudis
In-Reply-To: <1230042744-24675-1-git-send-email-u.kleine-koenig@pengutronix.de>
The result of providing the new flag -f is that the exported patches are
all placed directly in the output directory, not in subdirectories.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
tg-export.sh | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/tg-export.sh b/tg-export.sh
index 95aa346..06b9c8d 100644
--- a/tg-export.sh
+++ b/tg-export.sh
@@ -7,6 +7,7 @@ name=
branches=
output=
driver=collapse
+flatten=false
## Parse options
@@ -16,6 +17,8 @@ while [ -n "$1" ]; do
case "$arg" in
-b)
branches="$1"; shift;;
+ -f)
+ flatten=true;;
--quilt)
driver=quilt;;
--collapse)
@@ -34,6 +37,9 @@ done
[ -z "$branches" -o "$driver" = "quilt" ] ||
die "-b works only with the quilt driver"
+[ "$driver" = "quilt" ] || ! "$flatten" ||
+ die "-f works only with the quilt driver"
+
if [ -z "$branches" ]; then
# this check is only needed when no branches have been passed
name="$(git symbolic-ref HEAD | sed 's#^refs/heads/##')"
@@ -138,7 +144,18 @@ quilt()
return
fi
- filename="$output/$_dep.diff"
+ if "$flatten"; then
+ bn="$(echo "$_dep.diff" | sed -e 's#_#__#g' -e 's#/#_#g')";
+ dn="";
+ else
+ bn="$(basename "$_dep.diff")";
+ dn="$(dirname "$_dep.diff")/";
+ if [ "x$dn" = "x./" ]; then
+ dn="";
+ fi;
+ fi;
+
+ filename="$output/$dn$bn";
if [ -e "$filename" ]; then
# We've already seen this dep
return
@@ -148,9 +165,9 @@ quilt()
echo "Skip empty patch $_dep";
else
echo "Exporting $_dep"
- mkdir -p "$(dirname "$filename")"
+ mkdir -p "$output/$dn";
$tg patch "$_dep" >"$filename"
- echo "$_dep.diff -p1" >>"$output/series"
+ echo "$dn$bn -p1" >>"$output/series"
fi
}
--
1.5.6.5
^ permalink raw reply related
* [PATCH TOPGIT] tg export: implement skipping empty patches for collapse driver
From: Uwe Kleine-König @ 2008-12-23 14:32 UTC (permalink / raw)
To: git; +Cc: martin f. krafft, Petr Baudis
In-Reply-To: <20081223143035.GA24087@cassiopeia.tralala>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
README | 1 -
tg-export.sh | 10 +++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/README b/README
index c19985f..8be0d17 100644
--- a/README
+++ b/README
@@ -414,7 +414,6 @@ tg export
TODO: Make stripping of non-essential headers configurable
TODO: Make stripping of [PATCH] and other prefixes configurable
TODO: --mbox option for other mode of operation
- TODO: prevent exporting of empty patches by the collapse driver
TODO: -a option to export all branches
TODO: For quilt exporting, use a temporary branch and remove it when
done - this would allow producing conflict-less series
diff --git a/tg-export.sh b/tg-export.sh
index afb6f95..95aa346 100644
--- a/tg-export.sh
+++ b/tg-export.sh
@@ -91,9 +91,13 @@ collapsed_commit()
$(for p in $parent; do echo -p $p; done))"
fi
- (printf '%s\n\n' "$SUBJECT"; cat "$playground/^msg") |
- git stripspace |
- git commit-tree "$(pretty_tree "$name")" -p "$parent"
+ if branch_empty "$name"; then
+ echo "$parent";
+ else
+ (printf '%s\n\n' "$SUBJECT"; cat "$playground/^msg") |
+ git stripspace |
+ git commit-tree "$(pretty_tree "$name")" -p "$parent"
+ fi;
echo "$name" >>"$playground/^ticker"
}
--
1.5.6.5
^ permalink raw reply related
* a few Topgit patches
From: Uwe Kleine-König @ 2008-12-23 14:30 UTC (permalink / raw)
To: git; +Cc: martin f. krafft, Petr Baudis
Hello,
I hacked using topgit for some time now, and found the following changes
to topgit useful:
Uwe Kleine-König (3):
tg export: implement skipping empty patches for collapse driver
tg export: Implement flattening patch paths for quilt mode
tg export (quilt): Implement numbering the patches
README | 1 -
tg-export.sh | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
2 files changed, 44 insertions(+), 9 deletions(-)
You can fetch or pull these from
git://git.pengutronix.de/git/ukl/topgit.git master
or browse them using the following URL:
http://git.pengutronix.de/?p=ukl/topgit.git
For review I send the patches as a reply to this mail.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply
* Re: [announce] gc
From: Stephen Haberman @ 2008-12-23 14:22 UTC (permalink / raw)
To: Matthieu Moy; +Cc: git
In-Reply-To: <vpqabanc9v6.fsf@bauges.imag.fr>
> You should find a better name. I mean, one for which
>
> http://www.google.com/search?q=git+YOUR-NAME-HERE
>
> has a chance to find you ...
Ah, good point.
Perhaps "git corporate hooks" or "git enterprise hooks".
I'm a little cautious about using words like corporate/enterprise as
there is nothing exclusively "corporate/enterprise" about any of the
hooks in the project, we just happened to be on a corporate/enterprise
project when we came up with them.
"git enterprise hooks" seems like a potentially good name. I can't see
people googling explicitly for the "enterprise" keyword, but the "git
hooks" seems fairly likely.
Suggestions are welcome and thanks for the feedback.
- Stephen
^ permalink raw reply
* Re: 'Theirs' merge between branches on a binary file.
From: Tim Visher @ 2008-12-23 14:05 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7v3agfhk8b.fsf@gitster.siamese.dyndns.org>
On Mon, Dec 22, 2008 at 6:18 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Hmph, I meant to point you at:
>
> http://www.kernel.org/pub/software/scm/git/docs/git-checkout.html
Ah, yes. There it is. :)
> I think you can use "git checkout-index --stage=3 path" if your git is
> older than that one with the option.
>
> v1.6.0.1-15-g38901a4 (checkout --ours/--theirs: allow checking out one
> side of a conflicting merge, 2008-08-30) introduced the feature.
Apparently this was added, at least to the docs, only in the latest
release? That's kind of weird A) because the tag indicates 1.6.0.1,
not 0.6, and B) It's a pretty trivial operation in other VCSes.
Hmm... Maybe I'll try to updated the docs to make this feature a
little more visible.
Anyway, the checkout-index command does indeed work in the older
version. That's kind of what I was looking for. I'm now working on
compiling git under cygwin as the latest version cygwin installs for
you is 0.4!
Thanks for your help!
--
In Christ,
Timmy V.
http://burningones.com/
http://five.sentenc.es/ - Spend less time on e-mail
^ permalink raw reply
* Questions about repo and git submodule
From: Emily Ren @ 2008-12-23 14:01 UTC (permalink / raw)
To: Git Mailinglist
All,
I have some questions about android repo and git submodule.
I created a repo repository with below commands:
1. repo init -u git://android.git.kernel.org/platform/manifest.git
2. repo initialized in /android
1. The android dir is not a git repository, if other people clone my
android code, how does it work?
2. I want to make android dir to be a git repository, is it workable
that I create submodule for each subdirectory in another directory? Is
there a script for it?
Thank you ！
Emily
^ permalink raw reply
* Re: [announce] gc
From: Matthieu Moy @ 2008-12-23 13:13 UTC (permalink / raw)
To: Stephen Haberman; +Cc: git
In-Reply-To: <20081222212407.47c9ab1e.stephen@exigencecorp.com>
Stephen Haberman <stephen@exigencecorp.com> writes:
> Hi,
>
> This is just a small collections of hooks, scripts, and practices I
> developed while working on a not-distributed/corporate project.
You should find a better name. I mean, one for which
http://www.google.com/search?q=git+YOUR-NAME-HERE
has a chance to find you ...
My 2 cents,
--
Matthieu
^ permalink raw reply
* Re: git-cvsimport fuzzy commit log matching?
From: Martin Langhoff @ 2008-12-23 12:53 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: Matthias Urlichs, git
In-Reply-To: <20081223110302.GA9376@lst.de>
On Tue, Dec 23, 2008 at 9:03 AM, Christoph Hellwig <hch@lst.de> wrote:
> Any idea how to tell git-cvsimport that if we have exactly the same
> timestamp, and maybe the same author it really is the same changeset and
> we want to merge the commit message?
Right now, cvsimport relies on cvsps for this. cvsps compares author,
timestamp (with a fuzz factor 'cause cvs commits over slow networks or
hosts can span minutes - you could dial down to 0, it's the -z flag)
*and* commit msg.
What you could do is
1 - run cvsps with export to a file (I've posted in this list how to
run it exactly as cvsimport does)
2 - post-process cvsps ouput with perl (there's a parser already in
cvsimport ;-) )
3 - run cvsimport with the post-processed file
Or postprocess the imported git tree as others have suggested.
hth,
martin
--
martin.langhoff@gmail.com
martin@laptop.org -- School Server Architect
- ask interesting questions
- don't get distracted with shiny stuff - working code first
- http://wiki.laptop.org/go/User:Martinlanghoff
^ permalink raw reply
* Error : git svn fetch
From: chongyc @ 2008-12-23 12:25 UTC (permalink / raw)
To: git
Hi
I found that 'git svn fetch' failed in cloning the hudson svn reposotory.
I want to git-clone the svn repository
svn repository URL : https://svn.dev.java.net/svn/hudson/
username : guest
password :
So I run followings to git-clone
[root@localhost hudson]# git --version
git version 1.6.0.6
[root@localhost hudson]# git svn init -T trunk -t tags -b branches
https://svn.dev.java.net/svn/hudson/
[root@localhost hudson]# git svn fetch
Found possible branch point:
https://svn.dev.java.net/svn/hudson/tags/hudson-1_230 =>
https://svn.dev.java.net/svn/hudson/branches/buildnav-1636, 10490
Initializing parent: buildnav-1636@10490
Found possible branch point:
https://svn.dev.java.net/svn/hudson/trunk/hudson/main =>
https://svn.dev.java.net/svn/hudson/tags/hudson-1_230, 10450
Initializing parent: buildnav-1636@10450
Found branch parent: (buildnav-1636@10490) a1c395e5db063ca1ffbbe008e309c5
11d56219e0
Following parent with do_switch
remoting/pom.xml was not found in commit
a1c395e5db063ca1ffbbe008e309c511d56219e0 (r10447)
[root@localhost hudson]#
What shall I do to git-clone it ?
Please help me
>From chongyc
^ 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