On Sat, Oct 26, 2013 at 6:34 PM, Josh Triplett wrote:
> + format_commit_message(commit, "Fixes: %h ('%s')\n", sb, &ctx);
What is the value of double wrapping the commit message inside '...'
and then ('...')?
-Tony
--
To unsubscribe from this list: send the line "unsubscribe git" i
by Len Brown
Signed-off-by: Tony Luck <[EMAIL PROTECTED]>
---
diff --git a/Documentation/howto/using-topic-branches.txt
b/Documentation/howto/using-topic-branches.txt
--- a/Documentation/howto/using-topic-branches.txt
+++ b/Documentation/howto/using-topic-branches.txt
@@ -5,12 +5,10 @@ S
>* When the branch head pointed by $GIT_DIR/HEAD changes while
> the index file and working tree are looking the other way
> (e.g. somebody pushed into your repository, or you ran "git
> fetch" to update the ref your working tree is on), "git
> checkout" without -f gets confused. Figure out a good
> * Even if it does always choose the nicer choice of the two,
>Tony was lucky (no pun intended). Rather, we were lucky that
>Tony was observant. A careless merger may well have easily
>missed this mismerge (from the human point of view).
Actually I can't take credit here. This was
I'm at home, and too lazy to log in to work to look at my tree. But I
have a theory
as to what went wrong for me.
At the start I had a file, same contents in test and release branch.
I applied a patch to release, and pulled to test. So the contents are still
the same, both with the patch applie
So I have another anomaly in my GIT tree. A patch to
back out a bogus change to arch/ia64/hp/sim/boot/bootloader.c
in my release branch at commit
62d75f3753647656323b0365faa43fc1a8f7be97
appears to have been lost when I merged the release branch to
the test branch at commit
0c3e091838f02c537c
Sometimes the git-read-tree in git-checkout-script fails for me.
Make sure that the failed status is passed up to caller.
Signed-off-by: Tony Luck <[EMAIL PROTECTED]>
---
diff --git a/git-checkout-script b/git-checkout-script
--- a/git-checkout-script
+++ b/git-checkout-script
@@ -72,4
I'm a little closer to understanding how I got into the situation
where I made that ugly commit last week that included 10 files that
I didn't want, because I just had another failed merge (but this
time I know how to recover :).
The approximate sequence of events was:
SGI told me one of the pend
Linus Torvalds wrote:
> I'll happily help anybody who wants to try to write some nice
> documentation (answer questions etc), but I'm just not very good at doing
> it myself.
Here's something that I've been putting together on how I'm using
GIT as a Linux subsystem maintainer.
I suspect that I'm
apply.c: In function `show_rename_copy':
apply.c:1147: warning: field precision is not type int (arg 3)
Signed-off-by: Tony Luck <[EMAIL PROTECTED]>
---
diff --git a/apply.c b/apply.c
--- a/apply.c
+++ b/apply.c
@@ -1143,7 +1143,7 @@ static void show_rename_copy(
> The big problem, however, comes when Jeff (or anyone else) decides to
> repack. Then, if you fetch both his repo and Linus', you might end up
> with several really big pack files, that mostly overlap. That could
> easily mean storing most objects many times, if you don't do some smart
> selective
On 7/8/05, Jon Smirl <[EMAIL PROTECTED]> wrote:
> What happened in this session...
Linus has "packed" his GIT tree ... and now http-pull doesn't work.
rsync still does (provided
you have a new enough cogito).
-Tony
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a
> > cg-update from a local repo that contains packs is broken though :-(
>
> Is this with cg-0.12? The most recent release should be happy with packs.
Yes ... I pulled, built and installed the latest cogito this afternoon
before trying
to touch anything involving packs. cg-version says:
cogito-
> > So, what _is_ then the way to pull now, actually? If we use rsync, won't
> > we end up with having the objects we previous had twice now?
>
> Rsync works fine. You can either unpack the pack you get, or, if you
> prefer, just run
>
> git-prune-packed
cg-update from a local repo that
On 7/6/05, Jon Seymour <[EMAIL PROTECTED]> wrote:
> Ok, you asked for it:
>
> ...the GIT bucket.
>
> jon.
>
> ... ducks for cover ...
Groan ... as well you should.
My tree has re-appeared now. Thanks to whoever fixed it.
-Tony
-
To unsubscribe from this list: send the line "unsubscribe git"
http://www.kernel.org/git has stopped showing my linux-2.6 tree (the
"to Linus" one, my "test-2.6" tree is still there).
This is probably my fault ... but I'm not sure exactly why.
Here's what I did. Last Thursday I applied a set of patches ... and my "apply"
script choked on one of them. Some
On Wed, 20 Apr 2005, Brad Roberts wrote:
> How about fetching in the inverse order. Ie, deepest parents up towards
> current. With that method the repository is always self consistent, even
> if not yet current.
Daniel Barkalow replied:
> You don't know the deepest parents to fetch until you've
it/objects and .git/objects/xx directories).
-Tony
#!/bin/bash
# Copyright (C) 2005 Tony Luck
REMOTE=http://www.kernel.org/pub/linux/kernel/people/torvalds/linux-2.6.git/
rm -rf .gittmp
# set up a temp git repository so that we can use cat-file and ls-tree on the
# objects we pull without install
>Not a patch ... it is a whole file. I called it "git-wget", but it might
>also want to be called "git-pulltop".
It's been pointed out to me that I based this script on a pre-historic version
of ls-tree from sometime last week. Modern versions print the mode with %06o
so there is a leading 0 on
ch ... it is a whole file. I called it "git-wget", but it might
also want to be called "git-pulltop".
Signed-off-by: Tony Luck <[EMAIL PROTECTED]>
-- script starts here -
#!/bin/sh
# Copyright (C) 2005 Tony Luck
REMOTE=http://www.kernel.org/pub/linux/kernel/pe
On 4/16/05, Daniel Barkalow <[EMAIL PROTECTED]> wrote:
> +buffer = read_sha1_file(sha1, type, &size);
You never free this buffer.
It would also be nice if you saved "tree" objects in some temporary file
and did not install them until after you had fetched all the blobs and
trees that this
>I'm trying to understand how it works and I'll appreciate if someone could
>help.
>1. git uses object abstraction for the different types and so
>everything is in one directory (objects). From what I've seen in the
>implementation, the different kind of objects are not of the same type
>(there a
at the changeset
$ cat-file commit 0107d57e748b2f01601adb6749a03aed7b3f5a84
tree eab75ce51622aa312bb0b03572d43769f420c347
author Tony Luck <[EMAIL PROTECTED]> Thu Apr 14 14:57:27 2005
committer Tony Luck <[EMAIL PROTECTED]> Thu Apr 14 14:57:27 2005
First revision of the hello system
> OK. commit-tree now eats RFC2822 dates as AUTHOR_DATE because that's
> what you're going to want to feed it. We store seconds since UTC epoch,
> we add the author's or committer's timezone as auxiliary data so that
> dates can be pretty-printed in the original timezone later if anyone
> cares.
W
From: Tony Luck <[EMAIL PROTECTED]>
init-db calls getenv(DB_ENVIRONMENT) twice. Once should be enough.
Signed-off-by: Tony Luck <[EMAIL PROTECTED]>
---
init-db.c |2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- init-db.c
+++ init-db.c 2005-04-14 11:01:52.000
25 matches
Mail list logo
