* Re: Unhappy git in a jailshell?
From: Michael J Gruber @ 2009-11-02 13:51 UTC (permalink / raw)
To: Dmitry Potapov; +Cc: Alex MDC, git
In-Reply-To: <20091102124746.GA27126@dpotapov.dyndns.org>
Dmitry Potapov venit, vidit, dixit 02.11.2009 13:47:
> On Mon, Nov 02, 2009 at 11:16:43PM +1100, Alex MDC wrote:
>> Hello,
>>
>> I'm trying to use git on a linux server, but unfortunately I've only
>> been granted jailshelled access. Most of git works, but some commands
>> just fail to run, e.g.
>> git repack
>> git rebase
>> git index-pack
>
> Most Git commands are builtin, so they are executed by git.exe directly,
> but some commands are implemented as separate binaries or shell files.
> These commands require `git --exec-path` in PATH to run. Normally, git
> adds `git --exec-path` in its environment before running them.
>
> Apparently, jailshelled access prevents that somehow. So, I suggest you
> contact your system administrator and tell him that you need to be able
> to run files from `git --exec-path` to being able to use git, as git
> needs them internally for normal work.
>
Can you (Alex) find out whether you are allowed to run those binaries
from that path directly? In that case we could rethink our strategy and
adjust for the case where we can't set the environment.
Michael
^ permalink raw reply
* Re: Headless tags don't have a follows or precedes?
From: Tim Mazid @ 2009-11-02 13:16 UTC (permalink / raw)
To: git
In-Reply-To: <20091102130919.GB27126@dpotapov.dyndns.org>
Dmitry Potapov wrote:
>
> I have never heard tag being described as headless... A tag is just a
> pointer on some commit (annotated tag contains additional information
> such as creater, data, message), in any case, it has no direct relation
> to any branch.
>
> Tags do not store any precedes or follows information, no matter how you
> created them, but visualization tools can look at the tree and display
> what was before some commit and what was after it. Without seeing your
> tree, it is impossible to tell whether gitk (or what you use?) displayed
> that correctly or not.
>
Well, not the tag itself, but the commit the tags points to. Same thing.
Like you're always bothered to say "the commit that the tag v1 points to"
rather than "the v1 tag".
Also, see my post above.
--
View this message in context: http://n2.nabble.com/Headless-tags-don-t-have-a-follows-or-precedes-tp3926483p3931717.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply
* Re: Headless tags don't have a follows or precedes?
From: Dmitry Potapov @ 2009-11-02 13:09 UTC (permalink / raw)
To: Tim Mazid; +Cc: git
In-Reply-To: <26093136.post@talk.nabble.com>
On Wed, Oct 28, 2009 at 04:36:59AM -0700, Tim Mazid wrote:
>
> I've noticed that if I create a headless tag (one that doesn't have a
> branch, right?),
I have never heard tag being described as headless... A tag is just a
pointer on some commit (annotated tag contains additional information
such as creater, data, message), in any case, it has no direct relation
to any branch.
> when I click on that commit, it doesn't have precedes or
> follows information. Is this by design?
Tags do not store any precedes or follows information, no matter how you
created them, but visualization tools can look at the tree and display
what was before some commit and what was after it. Without seeing your
tree, it is impossible to tell whether gitk (or what you use?) displayed
that correctly or not.
Dmitry
^ permalink raw reply
* Re: Headless tags don't have a follows or precedes?
From: Tim Mazid @ 2009-11-02 13:07 UTC (permalink / raw)
To: git
In-Reply-To: <4AEEA96F.7080609@drmicha.warpmail.net>
Michael J Gruber-2 wrote:
>
> Tim Mazid venit, vidit, dixit 01.11.2009 10:31:
>>
>> Hi all,
>>
>> I've noticed that if I create a headless tag (one that doesn't have a
>> branch, right?), when I click on that commit, it doesn't have precedes or
>> follows information. Is this by design? Is there a work-around I can use
>> without creating a branch there?
>
> Reposting (without even saying so) doesn't necessarily increase your
> chance of getting responses.
>
I didn't repost. Or at the least, I didn't mean to repost. The mailing list
kept complaining (spamming me) that my post was pending, and I eventually
realised that was the old forum. I deleted it from there, and copy-pasted
here. I didn't even realise it had posted here, and that when I deleted from
the old forum, it didn't delete here.
Michael J Gruber-2 wrote:
>
> Would would help:
>
> - saying you're talking about gitk/git view/whatever it is you're
> "clicking" on
>
My apologies, yes, in gitk.
Michael J Gruber-2 wrote:
>
> - providing a minimal example others can reproduce. That would be one
> where a tag on a detached head (assuming that's what you mean) has no
> precedes/follow but a tag "on a branch" does have that info
>
Example (unless specified, commands as entered into bash)
mkdir temp
cd temp
git init
gitk --all &
git commit --allow-empty -m '1'
git tag v1
git commit --allow-empty -m '1.1'
git tag v1.1
git commit --allow-empty -m '1.2'
git tag v1.2
(in gitk, press ctrl+f5; all follows and precedes info is there)
git checkout v1.1
git commit --allow-empty -m '1.1.1'
git tag v1.1.1
(in gitk, press f5; follows and precedes info missing for v1.1 and v1.1.1)
(close gitk)
gitk --all &
(info still missing)
git commit --allow-empty -m '1.1.2'
git tag v1.1.2
(in gitk, press f5, info still missing)
git checkout master
git commit --allow-empty -m '1.3'
git tag v1.3
(in gitk, press f5, info still missing)
git commit --allow-empty -m '1.4'
git tag v1.4
(in gitk, press f5, info still missing)
git checkout -b temp v1.2
git commit --allow-empty -m '1.2.1'
git tag v1.2.1
(in gitk, press f5, info still missing)
git checkout master
git branch -D temp
git commit --allow-empty -m '1.5'
git tag v1.5
(in gitk, press f5, info still missing)
In the end, the only follows/precedes info is:
v1: precedes v1.1
v1.1: follows v1, precedes v1.2
v1.2: follows v1.1
All the rest is missing.
--
View this message in context: http://n2.nabble.com/Headless-tags-don-t-have-a-follows-or-precedes-tp3926483p3931674.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply
* Re: Unhappy git in a jailshell?
From: Dmitry Potapov @ 2009-11-02 12:47 UTC (permalink / raw)
To: Alex MDC; +Cc: git
In-Reply-To: <130714cd0911020416r6a686026q697d843f47b68692@mail.gmail.com>
On Mon, Nov 02, 2009 at 11:16:43PM +1100, Alex MDC wrote:
> Hello,
>
> I'm trying to use git on a linux server, but unfortunately I've only
> been granted jailshelled access. Most of git works, but some commands
> just fail to run, e.g.
> git repack
> git rebase
> git index-pack
Most Git commands are builtin, so they are executed by git.exe directly,
but some commands are implemented as separate binaries or shell files.
These commands require `git --exec-path` in PATH to run. Normally, git
adds `git --exec-path` in its environment before running them.
Apparently, jailshelled access prevents that somehow. So, I suggest you
contact your system administrator and tell him that you need to be able
to run files from `git --exec-path` to being able to use git, as git
needs them internally for normal work.
Dmitry
^ permalink raw reply
* [PATCH] Skip translation of wrong Tcl version text
From: Bernt Hansen @ 2009-11-02 12:41 UTC (permalink / raw)
To: Pat Thoyts; +Cc: git, Paul Mackerras
In-Reply-To: <874opel7de.fsf@gollum.intra.norang.ca>
We check the required Tcl version number before we setup msgcat for
language translation. If the Tcl version is too old just display the
untranslated error text.
The caller of show_error can now pass an alternative function for mc.
The Tcl list function turns the transalation into a no-op.
This fixes the
Error in startup script: invalid command name "mc"
when attempting to start gitk with Tcl 8.3.
Signed-off-by: Bernt Hansen <bernt@norang.ca>
---
I tested this patch with both Tcl 8.3 and 8.4.
This is an alternative to the previous 2 patches I sent attempting
to initialize msgcat before first use. This patch is much simpler
but does not attempt to translate the wrong version message text.
This patch fixes the version number error message by displaying it
untranslated since msgcat is not initialized yet. The current
initialization code for msgcat uses normalize which is only available as
of Tcl 8.4 so moving the code up front didn't work in Tcl 8.3.
gitk | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gitk b/gitk
index a0214b7..d1f32a9 100755
--- a/gitk
+++ b/gitk
@@ -1787,10 +1787,10 @@ proc make_transient {window origin} {
}
}
-proc show_error {w top msg} {
+proc show_error {w top msg {mc mc}} {
message $w.m -text $msg -justify center -aspect 400
pack $w.m -side top -fill x -padx 20 -pady 20
- button $w.ok -text [mc OK] -command "destroy $top"
+ button $w.ok -text [$mc OK] -command "destroy $top"
pack $w.ok -side bottom -fill x
bind $top <Visibility> "grab $top; focus $top"
bind $top <Key-Return> "destroy $top"
@@ -11006,8 +11006,8 @@ proc get_path_encoding {path} {
# First check that Tcl/Tk is recent enough
if {[catch {package require Tk 8.4} err]} {
- show_error {} . [mc "Sorry, gitk cannot run with this version of Tcl/Tk.\n\
- Gitk requires at least Tcl/Tk 8.4."]
+ show_error {} . "Sorry, gitk cannot run with this version of Tcl/Tk.\n\
+ Gitk requires at least Tcl/Tk 8.4." list
exit 1
}
--
1.6.5.2.141.gc8a58
^ permalink raw reply related
* git pull --rebase and losing commits
From: Peter Krefting @ 2009-11-02 12:26 UTC (permalink / raw)
To: Git Mailing List
Hi!
I have put my web site under Git control, and am running into some problems.
Whenever I push changes, I go via a bare repository, which then is pulled
into a checked out tree in my "public_html" directory. However, some scripts
I have does create files directly under the "public_html", and some of them
I want to push into the Git history.
I am trying to use --rebase everywhere to get a linear history in the cases
where I have pushed changes to the bare repository while there were
uncommited changes to the public_html directory.
I have come up with a script that does this (I have removed the
uninteresting non-git commands):
# Commit local changes
git add path/to/script/output/*
for file in $(git diff-index --cached --name-only HEAD); do
havenew=1
done
if [ $havenew = 1 ]; then
git commit --quiet -m 'Automatic' path/to/script/output/*
fi
# Update tree (--strategy=ours avoids merge conflicts)
git pull --rebase --strategy=ours origin master
# Push rebased local changes
git push origin master
# Update all references
git fetch origin master:remotes/origin/master
However, this seems to lose commits. When I ran it today, it commited an
automatic change, and then pulled a tree that did not contain that change,
making the changed file just disappear. I had to dig through the reflog to
find it:
- This is the auto-commit:
608b7eda553552841f4a16167c680fc74ed3c55a
509926edd306bb2f09f563a7cfda800a4f0fdaed Peter Krefting
<peter@softwolves.pp.se> 1257162580 +0100 commit: Automatisk
bloggkommentarsuppdatering
- This is the "git pull":
509926edd306bb2f09f563a7cfda800a4f0fdaed
9088bd4801a9008fe3fca0d351f97544cee014f1 Peter Krefting
<peter@softwolves.pp.se> 1257162583 +0100 rebase finished:
refs/heads/master onto 9088bd4801a9008fe3fca0d351f97544cee014f1
The history of 9088bd... does not contain the rebased version of 509926...,
it just went missing.
I guess I am missing something vital here.
$ git --version
git version 1.5.6.5
--
\\// Peter - http://www.softwolves.pp.se/
^ permalink raw reply
* Unhappy git in a jailshell?
From: Alex MDC @ 2009-11-02 12:16 UTC (permalink / raw)
To: git
Hello,
I'm trying to use git on a linux server, but unfortunately I've only
been granted jailshelled access. Most of git works, but some commands
just fail to run, e.g.
git repack
git rebase
git index-pack
All these commands fail with the error "git: git-xxx is not a
git-command. See git --help". However most other every-day commands
work just fine (add, status, commit...)
I've been in contact with the server admins and they kindly upgraded
git to the latest 1.6.5.2 release but that didn't help. I enquired
about the contents of `git --exec-path` (as I don't have access from
the jailshell) and they said that all the "missing" commands are
present in that directory.
I also tried "git --help -all" but that doesn't show any commands in
the output! In a way I'm wondering how it is working at all...
So I guess my question is, why are some commands working but not
others? If all commands are treated uniformly by using the command
binary from the libexec dir it would seem as though all commands
should work or all should be "missing".
Also, are they any ideas on how to get the missing commands to work?
Thanks for your help,
Alex MDC
^ permalink raw reply
* Re: [ANNOUNCE] Stacked Git 0.15
From: Felipe Contreras @ 2009-11-02 10:05 UTC (permalink / raw)
To: Catalin Marinas; +Cc: Git Mailing List
In-Reply-To: <b0943d9e0910241541n7b1091ecp6b21fa896405afa0@mail.gmail.com>
On Sun, Oct 25, 2009 at 12:41 AM, Catalin Marinas
<catalin.marinas@gmail.com> wrote:
> StGit is a Python application providing functionality similar to Quilt
> (i.e. pushing/popping patches to/from a stack) on top of Git. These
> operations are performed using Git commands, and the patches are
> stored as Git commit objects, allowing easy merging of the StGit
> patches into other repositories using standard Git functionality.
>
> Download: http://download.gna.org/stgit/stgit-0.15.tar.gz
> Main repository: git://repo.or.cz/stgit.git
> Project homepage: http://www.procode.org/stgit/
> Mailing list: git@vger.kernel.org (please use "StGit" in the subject)
> Bug tracker: https://gna.org/bugs/?group=stgit
>
> The main changes since release 0.14.3 are
>
> - New core infrastructure for repository operations, including
>
> + Infinite undo/redo operations and corresponding commands.
>
> + Automatic rollback of changes following a failed operation
> (using transactions)---this ensures that StGit commands either
> succeed or do nothing. Previously, every commands had its own
> ad hoc implementation of this.
>
> - Some commands were added, including
>
> + "stg squash", for combining two or more patches into one.
>
> + "stg publish", for maintaining merge-friendly branches (which
> are not rebased).
>
> + "stg prev/next" for printing the name of the previous or next
> patch in the series.
>
> - The commands "stg add", "stg rm", "stg cp", and "stg resolved"
> were removed, since there are corresponding Git equivalents.
>
> - The "stg import" and "stg fold" commands support the "-p N" option
> for stripping leading slashes from diff paths.
>
> - The "stg import" and "stg fold" commands support the "--reject"
> option for leaving rejected hunks in corresponding *.rej files.
>
> - New patch identification syntax: <branch>:<patch> (see
> documentation for the "stg id" command).
>
> - Autosigning of imported patches when "sign.autosign" configuration
> option is set.
>
> - A powerful Emacs mode for StGit was added to the "contrib"
> directory. It displays the patch stack in an Emacs buffer, and can
> handle all common StGit tasks.
>
> - Improved bash tab-completion, automatically generated from the stg
> command definitions.
>
> - Man pages and an improved tutorial.
>
> Special thanks go to Karl Wiberg for the hard work done on the new
> StGit features, to Catalin Marinas for many new features and bugfixes,
> and to David Kågedal and Gustav Hållberg for the Emacs mode.
I don't know why, but the announcement RSS feed breaks exactly here
due to some UTF-8 miss-match or something:
wget http://gitrss.q42.co.uk/announce.rss
--
Felipe Contreras
^ permalink raw reply
* Re: Headless tags don't have a follows or precedes?
From: Michael J Gruber @ 2009-11-02 9:42 UTC (permalink / raw)
To: Tim Mazid; +Cc: git
In-Reply-To: <1257067898626-3926483.post@n2.nabble.com>
Tim Mazid venit, vidit, dixit 01.11.2009 10:31:
>
> Hi all,
>
> I've noticed that if I create a headless tag (one that doesn't have a
> branch, right?), when I click on that commit, it doesn't have precedes or
> follows information. Is this by design? Is there a work-around I can use
> without creating a branch there?
Reposting (without even saying so) doesn't necessarily increase your
chance of getting responses. Would would help:
- saying you're talking about gitk/git view/whatever it is you're
"clicking" on
- providing a minimal example others can reproduce. That would be one
where a tag on a detached head (assuming that's what you mean) has no
precedes/follow but a tag "on a branch" does have that info
Cheers,
Michael
^ permalink raw reply
* [PATCH] t1402: Make test executable
From: Stephen Boyd @ 2009-11-02 9:30 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
---
0 files changed, 0 insertions(+), 0 deletions(-)
mode change 100644 => 100755 t/t1402-check-ref-format.sh
diff --git a/t/t1402-check-ref-format.sh b/t/t1402-check-ref-format.sh
old mode 100644
new mode 100755
--
1.6.5.2.181.gd6f41
^ permalink raw reply
* Re: stgit, rebasing with 100 patches
From: Karl Wiberg @ 2009-11-02 8:22 UTC (permalink / raw)
To: Jon Smirl; +Cc: Git Mailing List, Catalin Marinas
In-Reply-To: <9e4733910910040600g2cbd1deah6e7ae3ad9a4aa54e@mail.gmail.com>
On Sun, Oct 4, 2009 at 2:00 PM, Jon Smirl <jonsmirl@gmail.com> wrote:
> On Thu, Oct 1, 2009 at 7:04 PM, Jon Smirl <jonsmirl@gmail.com> wrote:
>
> > Is there a better way to locate the patches the got applied?
>
> A solution to this is to make an option on rebase that walks the
> patch stack forward one commit at a time.
>
> What does the --merged option do on stg rebase? The doc is rather
> sparse.
Right, -m/--merged is what you want. Before applying any of the
patches, it tries to reverse-apply all of them in reverse
order---successful applications mean the patch was already in
upstream. It works surprisingly well.
--
Karl Wiberg, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply
* Re: [PATCH] Update packfile transfer protocol documentation
From: Junio C Hamano @ 2009-11-02 5:17 UTC (permalink / raw)
To: Scott Chacon; +Cc: git list, Shawn O. Pearce, Junio C Hamano
In-Reply-To: <d411cc4a0911011518q15a8267bn642e6937be8c9ab1@mail.gmail.com>
Scott Chacon <schacon@gmail.com> writes:
> The technical documentation for the packfile protocol is both sparse and
> incorrect. This documents the fetch-pack/upload-pack and send-pack/
> receive-pack protocols much more fully.
>
> Add documentation from Shawn's upcoming http-protocol docs that is shared
> by the packfile protocol. protocol-common.txt describes ABNF notation
> amendments, refname rules and the packet line format.
>
> Add documentation on the various capabilities supported by the
> upload-pack and receive-pack protocols. protocol-capabilities.txt describes
> multi-ack, thin-pack, side-band[-64k], shallow, no-progress, include-tag,
> ofs-delta, delete-refs and report-status.
>
> Signed-Off-By: Scott Chacon <schacon@gmail.com>
> ---
This is just for future reference, but please downcase O and B above.
> diff --git a/Documentation/technical/pack-protocol.txt
> b/Documentation/technical/pack-protocol.txt
> index 9cd48b4..1cc61d8 100644
> --- a/Documentation/technical/pack-protocol.txt
> +++ b/Documentation/technical/pack-protocol.txt
> +Packfile transfer protocols
> +===========================
> +
> +Git supports transferring data in packfiles over the ssh://, git:// and
> +file:// transports. There exist two sets of protocols, one for pushing
> +data from a client to a server and another for fetching data from a
> +server to a client. All three transports (ssh, git, file) use the same
> +protocol to transfer data.
> +
> +The processes invoked in the canonical Git implementation are 'upload-pack'
> +on the server side and 'fetch-pack' on the client side for fetching data;
> +then 'receive-pack' on the server and 'send-pack' on the client for pushing
> +data. The protocol functions to have a server tell a client what is
> +currently on the server, then for the two to negotiate the smallest amount
> +of data to send in order to fully update one or the other.
> +
> +Transports
> +----------
> +There are three transports over which the packfile protocol is
> +initiated. The Git transport is a simple, unauthenticated server that
> +simply takes the command (almost always 'upload-pack', though Git
> +servers can be configured to be globally writable, in which 'receive-
> +pack' initiation is also allowed) with which the client wishes to
> +communicate and executes it and connects it to the requesting
> +process.
> +
> +In the SSH transport, the client basically just runs the 'upload-pack'
> +or 'receive-pack' process on the server over the SSH protocol and then
> +communicates with that invoked process over the SSH connection.
> +
> +The file:// transport simply runs the 'upload-pack' or 'receive-pack'
> +process locally and communicates with it over a pipe.
Very nicely and concisely written. Noise words like "simply" and
"basically" might be better omitted, though (not just this part but in the
rest of the document as well).
Yes, I admit I have the tendency to excessively use them, too.
> +Git Protocol
> +------------
> +
> +The Git protocol starts off by sending "git-receive-pack 'repo.git'"
> +on the wire using the pkt-line format, followed by a null byte and a
> +hostname paramater, terminated by a null byte.
> +
> + 0032git-upload-pack /project.git\0host=myserver.com\0
Two-and-a-half issues.
- You are calling distinction between ssh/git/file "transport", and the
actual data exchange for pushing/fetching "protocol" in the first part
of the document, and I agree with the choice of words. The header for
this section should read "Git Transport", as that is what you are
describing.
- The example and the first line of the description contradict with each
other.
- As you already said that receive-pack could be requested over git
transport in the earlier part, I would fix the description on the first
line to say "... by sending 'command' and 'repository' on the wire ..."
to make it explain the _concept_.
> +--
> + git-proto-request = request-command SP pathname NUL [ host-parameter NUL ]
> + request-command = "git-upload-pack" / "git-receive-pack" /
> + "git-upload-archive" ; case sensitive
> + pathname = *( %x01-ff ) ; exclude NUL
> + host-parameter = "host=" hostname [ ":" port ]
> +--
> +Only host-parameter is allowed in the git-proto-request. Clients
> +MUST NOT attempt to send additional parameters. It is used for the
> +git-daemon name based virtual hosting. See --interpolated-path
> +option to git daemon, with the %H/%CH format characters.
> +Basically what the Git client is doing to connect to an 'upload-pack'
> +process on the server side over the Git protocol is this:
> +
> + $ echo -e -n \
> + "0039git-upload-pack /schacon/gitbook.git\0host=example.com\0" |
> + nc -v example.com 9418
> +
> +
> +SSH Protocol
> +------------
This is "SSH Transport", I think.
> +Initiating the upload-pack or receive-pack processes over SSH is
> +simply executing the binary on the server via SSH remote execution.
> +It is basically equivalent to running this:
> +
> + $ ssh git.example.com "git-upload-pack '/project.git'"
> +
> +For a server to support Git pushing and pulling for a given user over
> +SSH, that user needs to be able to execute one or both of those
> +commands via the SSH shell that they are provided on login. On some
> +systems, that shell access is limited to only being able to run those
> +two commands, or even just one of them.
> +
> +In an ssh:// format URI, it's absolute in the URI, so the '/' after
> +the host name (or port number) is sent as an argument, which is then
> +read by the remote git-upload-pack exactly as is, so it's effectively
> +an absolute path in the remote filesystem.
> +
> + git clone ssh://user@example.com/project.git
> + |
> + v
> + ssh user@example.com "git-upload-pack '/project.git'"
> +
> +In a "user@host:path" format URI, its relative to the user's home
> +directory, because the Git client will run:
> +
> + git clone user@example.com:project.git
> + |
> + v
> + ssh user@example.com "git-upload-pack 'project.git'"
> +
> +The exception is if a '~' is used, in which case
> +we execute it without the leading '/'.
> +
> + ssh://user@example.com/~alice/project.git,
> + |
> + v
> + ssh user@example.com "git-upload-pack '~alice/project.git'"
This depends on the intended audience of this document, but if we are
writing for people who want to implement their own gitosis and gitolite to
replace the login shell spawned by ssh daemon, you may want to explain the
"command line" given to it a bit more precisely. Specifically:
- The "command name" is spelled with dash (e.g. git-upload-pack), but
this can be overridden by the client;
- The repository path is always quoted with sq (i.e. by sq_quote_buf()).
> +Fetching Data From a Server
> +===========================
> +
> +When one Git repository wants to get all the data that a second
> +repository has, the first can 'fetch' from the second. This
> +operation determines what data the server has that the client does
> +not then streams that data down to the client in packfile format.
I've been disturbed by this "all" since your first draft, as fetching data
reachable from only a few refs but not all is perfectly a valid thing to
do, but I am not sure if it is worth complicating this document to clarify
this point. Probably not---but then the above would read perfectly well
without "all".
> +The server side binaries need to be executable as 'git-upload-pack'
> +for fetching and 'git-receive-pack' for pushing over SSH, since the
> +Git clients will connect to the server and attempt to run that command
> +directly. Over the Git protocol, one could write their own daemon
> +that sees that the client is trying to invoke those commands and
> +simply handle the requests.
I am not sure what audience this paragraph is trying to help by making it
sound as if git transport allows customized daemon but ssh transport
doesn't. gitosis and gitolite are examples of "own daemon that sees that
the client is trying to invoke those commands and simply handle the
requests" over SSH, aren't they? So if the purpose is to help server
authors, this paragraph does more harm than being useful. If the purpose
is to satisfy curiosity, I doubt this level of detail is necessary.
Also there is a terminology mix-up; the last sentence should begin with
"Over the Git transport".
> +Reference Discovery
> +-------------------
> +
> +When the client initially connects the server will immediately respond
> +with a listing of each reference it has (all branches and tags) along
> +with the commit SHA that each reference currently points to.
Not "the commit SHA", but "object name". a ref can point at a non-commit
object, such as a tag.
> + $ echo -e -n \
> + "0039git-upload-pack /schacon/gitbook.git\0host=example.com\0" |
> + nc -v example.com 9418
> + 00887217a7c7e582c46cec22a130adf4b9d7d950fba0 HEAD\0multi_ack \
> + thin-pack side-band side-band-64k ofs-delta shallow no-progress \
> + include-tag
We should explain this is actually a long single line, and line folding
with backslashes is solely for the readers of this document, after this
sample response.
> + 00441d3fcd5ced445d1abc402225c0b8a1299641f497 refs/heads/integration
> + 003f7217a7c7e582c46cec22a130adf4b9d7d950fba0 refs/heads/master
> + 003cb88d2441cac0977faf98efc80305012112238d9d refs/tags/v0.9
> + 003c525128480b96c89e6418b1e40909bf6c5b2d580f refs/tags/v1.0
> + 003fe92df48743b7bc7d26bcaabfddde0a1e20cae47c refs/tags/v1.0^{}
> + 0000
> +Server SHOULD terminate each non-flush line
> +using LF ("\n") terminator; client MUST NOT complain if there is no
> +terminator.
Hmm, LF ("\n") makes me wonder how precise we would want to be. We
probably should also say we use ASCII (meaning "not EBCDIC") somewhere but
that level of details can wait until a more later draft..
> +The returned response is a pkt-line stream describing each ref and
> +its known value. The stream SHOULD be sorted by name according to
> +the C locale ordering. The stream SHOULD include the default ref
> +named 'HEAD' as the first ref. The stream MUST include capability
> +declarations behind a NUL on the first ref.
I have a vague recollection that in a recent discussion (not discussion on
this documentation patch, but on a "builtin-fetch.c" patch around mid
September), we decided that the above two SHOULD should be MUST. Another
MUST that is missing from here is that a line that describes a peeled tag
MUST immediately follow the tag itself.
Shawn?
> +----
> + advertised-refs = (no-refs / list-of-refs)
> + flush-pkt
> +
> + no-refs = PKT-LINE(zero-id SP "capabilities^{}"
> + NUL capability-list LF)
> +
> + list-of-refs = first-ref *other-ref
> + first-ref = PKT-LINE(obj-id SP refname
> + NUL capability-list LF)
> +
> + other-ref = PKT-LINE(other-tip / other-peeled)
> + other-tip = obj-id SP refname LF
> + other-peeled = obj-id SP refname "^{}" LF
> +
> + capability-list = capability *(SP capability)
> + capability = 1*(ALPHA / DIGIT / "-" / "_")
> +----
> +
> +Server and client SHOULD use lowercase for SHA1, both MUST treat SHA1
> +as case-insensitive.
Why do we need to retroactively loosen these to allow uppercases? Are
there implementations that want this loosening?
> +Packfile Negotiation
> +--------------------
I'll look at the rest another day.
Thanks.
^ permalink raw reply
* Re: Fw: git-core: SIGSEGV during {peek,ls}-remote on HTTP remotes.
From: Junio C Hamano @ 2009-11-02 4:10 UTC (permalink / raw)
To: Sverre Rabbelier
Cc: Daniel Barkalow, Junio C Hamano, Samium Gromoff, git,
Tay Ray Chuan, Mike Hommey
In-Reply-To: <fabb9a1e0911011254j316920e6y63c4f129f7df186d@mail.gmail.com>
Sverre Rabbelier <srabbelier@gmail.com> writes:
> On Sun, Nov 1, 2009 at 21:16, Daniel Barkalow <barkalow@iabervon.org> wrote:
>> If we change the ls-remote.c case, it becomes impossible for a struct
>> transport to ever have a NULL remote field. And the change to ls-remote
>> removes a special case. I'd go so far as to say that ls-remote.c should
>> provide a struct remote, and transport_get should enforce that there's a
>> struct remote.
>
> If that is the case (that we can eliminate the only special case), I
> agree that we should fix it there, where it will be the least effort.
> I got the impression from Junio's original post that there are
> multiple places that would have to be fixed, and I figured that we
> should fix it where it will be the least amount of effort :).
No, I genuinely didn't know what Daniel's intention was when a transport
has NULL in its remote field. If it is much easier and cleaner not to
allow such a transport, then let's declare that and fix ls-remote that
should be the sole existing caller that used to use such a transport.
Thanks for looking into this, both of you.
^ permalink raw reply
* Re: [RFC PATCH 06/19] Factor ref updating out of fetch_with_import
From: Daniel Barkalow @ 2009-11-02 3:16 UTC (permalink / raw)
To: Sverre Rabbelier; +Cc: Git List, Johannes Schindelin, Johan Herland
In-Reply-To: <fabb9a1e0911011733o7d8d95eem57e02d455e0bd86@mail.gmail.com>
On Mon, 2 Nov 2009, Sverre Rabbelier wrote:
> Yes, that sounds very reasonable, and I think that's the right way to
> go. This leaves us with only one thing, we need a remote HEAD for 'git
> clone hg::/path/to/repo' to work and have it check out a branch, I
> think a seperate 'head' command might be appropriate? If supported it
> returns the which local symref (e.g. 'refs/heads/trunkr' in the svn
> case) should be pointed at by HEAD. If not supported we can just not
> set it and clone will give the default 'no remote HEAD, nothing
> checked out' message, which would probably be best for p4?
Why not have the regular list report:
@refs/heads/trunkr HEAD
or whatever it is, again like native git? That is, SVN would have an
interaction like:
> list
< ? refs/heads/trunkr
< ? refs/heads/my-branch
< ? refs/tags/v1.0
< @refs/heads/trunkr HEAD
<
This is similar to the response from the curl helper, except that it uses
"?" for the sha1s because it doesn't know them until they're imported.
-Daniel
*This .sig left intentionally blank*
^ permalink raw reply
* Re: [PATCH] commit -c/-C/--amend: acquire authorship and restamp time with --claim
From: Junio C Hamano @ 2009-11-02 3:07 UTC (permalink / raw)
To: Erick Mattos; +Cc: git
In-Reply-To: <7v1vkhy6n4.fsf@alter.siamese.dyndns.org>
The last one was probably harder to read since it was an interdiff. Here
is what I am considering to queue.
No, I didn't use --mine option when I ran "commit --amend" to record this
one ;-)
-- >8 --
From: Erick Mattos <erick.mattos@gmail.com>
Date: Sun, 1 Nov 2009 16:45:27 -0200
Subject: [PATCH] git commit --mine: ignore authorship information taken from -c/-C/--amend
When we use -c, -C, or --amend, we are trying one of two things: using the
source as a template or modifying a commit with corrections.
When these options are are used, the authorship and timestamp recorded in
the newly created commit is always taken from the original commit. This
is inconvenient when you want to just borrow the commit log message, or
your change is so significant that you should take over the authorship
(with the blame for bugs you introduced).
Signed-off-by: Erick Mattos <erick.mattos@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/git-commit.txt | 7 +++-
builtin-commit.c | 10 +++-
t/t7509-commit.sh | 103 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 116 insertions(+), 4 deletions(-)
create mode 100755 t/t7509-commit.sh
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 0578a40..7832720 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -9,7 +9,7 @@ SYNOPSIS
--------
[verse]
'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend] [--dry-run]
- [(-c | -C) <commit>] [-F <file> | -m <msg>]
+ [(-c | -C) <commit>] [-F <file> | -m <msg>] [--mine]
[--allow-empty] [--no-verify] [-e] [--author=<author>]
[--cleanup=<mode>] [--] [[-i | -o ]<file>...]
@@ -69,6 +69,11 @@ OPTIONS
Like '-C', but with '-c' the editor is invoked, so that
the user can further edit the commit message.
+--mine::
+ When used with -C/-c/--amend options, declare that the
+ authorship of the resulting commit now belongs of the committer.
+ This also renews the author timestamp.
+
-F <file>::
--file=<file>::
Take the commit message from the given file. Use '-' to
diff --git a/builtin-commit.c b/builtin-commit.c
index beddf01..aa42989 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -51,7 +51,7 @@ static const char *template_file;
static char *edit_message, *use_message;
static char *author_name, *author_email, *author_date;
static int all, edit_flag, also, interactive, only, amend, signoff;
-static int quiet, verbose, no_verify, allow_empty, dry_run;
+static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;
static char *untracked_files_arg;
/*
* The default commit message cleanup mode will remove the lines
@@ -91,8 +91,9 @@ static struct option builtin_commit_options[] = {
OPT_FILENAME('F', "file", &logfile, "read log from file"),
OPT_STRING(0, "author", &force_author, "AUTHOR", "override author for commit"),
OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m),
- OPT_STRING('c', "reedit-message", &edit_message, "COMMIT", "reuse and edit message from specified commit "),
+ OPT_STRING('c', "reedit-message", &edit_message, "COMMIT", "reuse and edit message from specified commit"),
OPT_STRING('C', "reuse-message", &use_message, "COMMIT", "reuse message from specified commit"),
+ OPT_BOOLEAN(0, "mine", &renew_authorship, "the commit is authored by me now (used with -C-c/--amend)"),
OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"),
OPT_FILENAME('t', "template", &template_file, "use specified template file"),
OPT_BOOLEAN('e', "edit", &edit_flag, "force edit of commit"),
@@ -381,7 +382,7 @@ static void determine_author_info(void)
email = getenv("GIT_AUTHOR_EMAIL");
date = getenv("GIT_AUTHOR_DATE");
- if (use_message) {
+ if (use_message && !renew_authorship) {
const char *a, *lb, *rb, *eol;
a = strstr(use_message_buffer, "\nauthor ");
@@ -747,6 +748,9 @@ static int parse_and_validate_options(int argc, const char *argv[],
if (force_author && !strchr(force_author, '>'))
force_author = find_author_by_nickname(force_author);
+ if (force_author && renew_authorship)
+ die("Using both --mine and --author does not make sense");
+
if (logfile || message.len || use_message)
use_editor = 0;
if (edit_flag)
diff --git a/t/t7509-commit.sh b/t/t7509-commit.sh
new file mode 100755
index 0000000..ec13cea
--- /dev/null
+++ b/t/t7509-commit.sh
@@ -0,0 +1,103 @@
+#!/bin/sh
+#
+# Copyright (c) 2009 Erick Mattos
+#
+
+test_description='git commit --mine'
+
+. ./test-lib.sh
+
+author_header () {
+ git cat-file commit "$1" |
+ sed -n -e '/^$/q' -e '/^author /p'
+}
+
+message_body () {
+ git cat-file commit "$1" |
+ sed -e '1,/^$/d'
+}
+
+test_expect_success '-C option copies authorship and message' '
+ echo "Initial" >foo &&
+ git add foo &&
+ test_tick &&
+ git commit -m "Initial Commit" --author Frigate\ \<flying@over.world\> &&
+ git tag Initial &&
+ echo "Test 1" >>foo &&
+ test_tick &&
+ git commit -a -C Initial &&
+ author_header Initial >expect &&
+ author_header HEAD >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '-C option copies only the message with --mine' '
+ echo "Test 2" >>foo &&
+ test_tick &&
+ git commit -a -C Initial --mine &&
+ echo "author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect &&
+ author_header HEAD >actual
+ test_cmp expect actual &&
+
+ message_body Initial >expect &&
+ message_body HEAD >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '-c option copies authorship and message' '
+ echo "Test 3" >>foo &&
+ test_tick &&
+ EDITOR=: VISUAL=: git commit -a -c Initial &&
+ author_header Initial >expect &&
+ author_header HEAD >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '-c option copies only the message with --mine' '
+ echo "Test 4" >>foo &&
+ test_tick &&
+ EDITOR=: VISUAL=: git commit -a -c Initial --mine &&
+ echo "author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect &&
+ author_header HEAD >actual &&
+ test_cmp expect actual &&
+
+ message_body Initial >expect &&
+ message_body HEAD >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '--amend option copies authorship' '
+ git checkout Initial &&
+ echo "Test 5" >>foo &&
+ test_tick &&
+ git commit -a --amend -m "amend test" &&
+ author_header Initial >expect &&
+ author_header HEAD >actual &&
+
+ echo "amend test" >expect &&
+ message_body HEAD >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '--mine makes the commit ours even with --amend option' '
+ git checkout Initial &&
+ echo "Test 6" >>foo &&
+ test_tick &&
+ git commit -a --mine -m "Changed again" --amend &&
+ echo "author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect &&
+ author_header HEAD >actual &&
+ test_cmp expect actual &&
+
+ echo "Changed again" >expect &&
+ message_body HEAD >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '--mine and --author are mutually exclusive' '
+ git checkout Initial &&
+ echo "Test 7" >>foo &&
+ test_tick &&
+ test_must_fail git commit -a --mine --author="Xyzzy <frotz@nitfol.xz>"
+'
+
+test_done
--
1.6.5.2.246.gc99575
^ permalink raw reply related
* Re: [PATCH] commit -c/-C/--amend: acquire authorship and restamp time with --claim
From: Junio C Hamano @ 2009-11-02 2:58 UTC (permalink / raw)
To: Erick Mattos; +Cc: git
In-Reply-To: <55bacdd30911011654k22eb6b13r28897bf71fc5e11b@mail.gmail.com>
Erick Mattos <erick.mattos@gmail.com> writes:
> 2009/11/1 Junio C Hamano <gitster@pobox.com>:
>> Erick Mattos <erick.mattos@gmail.com> writes:
>>
>>>> % git commit --claim --author='Erick Mattos <eric@mattos>' -C HEAD
>>>>
>>>> Should you detect an error? Does your code do so? Do you have a test
>>>> that catches this error?
>>>
>>> It works as intended. Both together.
>>
>> That does not make any sense. If you are saying this is yours and it is
>> his at the same time, there can be no sane way to work "as intended", no?.
>
> I am adding a new option not changing the option --author already in
> git. So it does work together.
Somebody who says "this commit is mine, and its author is this other
person" is not making any sense. The resulting commit can either have
that person (i.e. the committer) as the author, which is what the "claim"
option means, or it can have the person named with --author as the author,
but both cannot be true at the same time.
When you introduce a new option, sometimes it cannot sanely be used with
an existing option. In such a case, two options (the new one and the
existing one) are called mutually exclusive. And you add some code to
catch an user error to use them together.
>>>>> + git commit -c HEAD <<EOF
>>>>> + "Changed"
>>>>> + EOF &&
>>>>
>>>> What editor is reading this "Changed"?
>>>
>>> Nobody cares... Just a text to change the file.
>>
>> I actually care. Who uses that Changed string, and where does it end up
>> with? At the end of the log message? At the beginning? What "file"?
>
> I didn't get it. -c option does not accept -m option and starts an
> editor to change the message. The text "Changed is just a forced
> message. I can not use an editor in interactive mode in a script...
How are the existing tests that try "commit -c" do this? I do not think
there is any here-text redirect into "git commit".
It is sometimes easier to show by example than by giving nudging words
that only show direction, so here is a suggested rewrite on top of your
patch. I am not very happy with the option name "mine" either, but at
least I think this gets the semantics right.
Documentation/git-commit.txt | 10 ++--
Makefile | 1 +
builtin-commit.c | 9 ++-
t/t7509-commit.sh | 144 +++++++++++++++++++++++-------------------
4 files changed, 92 insertions(+), 72 deletions(-)
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 01eeb3e..7832720 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -9,7 +9,7 @@ SYNOPSIS
--------
[verse]
'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend] [--dry-run]
- [(-c | -C) <commit>] [-F <file> | -m <msg>] [--claim]
+ [(-c | -C) <commit>] [-F <file> | -m <msg>] [--mine]
[--allow-empty] [--no-verify] [-e] [--author=<author>]
[--cleanup=<mode>] [--] [[-i | -o ]<file>...]
@@ -61,18 +61,18 @@ OPTIONS
-C <commit>::
--reuse-message=<commit>::
Take an existing commit object, and reuse the log message
- and the authorship information when creating the commit.
+ and the authorship information (including the timestamp)
+ when creating the commit.
-c <commit>::
--reedit-message=<commit>::
Like '-C', but with '-c' the editor is invoked, so that
the user can further edit the commit message.
---claim::
+--mine::
When used with -C/-c/--amend options, declare that the
authorship of the resulting commit now belongs of the committer.
- This also renews the author timestamp. Therefore this option
- sets the use of only the message from the original commit.
+ This also renews the author timestamp.
-F <file>::
--file=<file>::
diff --git a/Makefile b/Makefile
index 15ea32d..a9108b3 100644
--- a/Makefile
+++ b/Makefile
@@ -1944,3 +1944,4 @@ coverage-report:
grep '^function.*called 0 ' *.c.gcov \
| sed -e 's/\([^:]*\)\.gcov: *function \([^ ]*\) called.*/\1: \2/' \
| tee coverage-untested-functions
+
diff --git a/builtin-commit.c b/builtin-commit.c
index 1aeafa6..aa42989 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -51,7 +51,7 @@ static const char *template_file;
static char *edit_message, *use_message;
static char *author_name, *author_email, *author_date;
static int all, edit_flag, also, interactive, only, amend, signoff;
-static int quiet, verbose, no_verify, allow_empty, dry_run, claim;
+static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;
static char *untracked_files_arg;
/*
* The default commit message cleanup mode will remove the lines
@@ -93,7 +93,7 @@ static struct option builtin_commit_options[] = {
OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m),
OPT_STRING('c', "reedit-message", &edit_message, "COMMIT", "reuse and edit message from specified commit"),
OPT_STRING('C', "reuse-message", &use_message, "COMMIT", "reuse message from specified commit"),
- OPT_BOOLEAN(0, "claim", &claim, "acquire authorship and restamp time of resulting commit"),
+ OPT_BOOLEAN(0, "mine", &renew_authorship, "the commit is authored by me now (used with -C-c/--amend)"),
OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"),
OPT_FILENAME('t', "template", &template_file, "use specified template file"),
OPT_BOOLEAN('e', "edit", &edit_flag, "force edit of commit"),
@@ -382,7 +382,7 @@ static void determine_author_info(void)
email = getenv("GIT_AUTHOR_EMAIL");
date = getenv("GIT_AUTHOR_DATE");
- if (use_message && !claim) {
+ if (use_message && !renew_authorship) {
const char *a, *lb, *rb, *eol;
a = strstr(use_message_buffer, "\nauthor ");
@@ -748,6 +748,9 @@ static int parse_and_validate_options(int argc, const char *argv[],
if (force_author && !strchr(force_author, '>'))
force_author = find_author_by_nickname(force_author);
+ if (force_author && renew_authorship)
+ die("Using both --mine and --author does not make sense");
+
if (logfile || message.len || use_message)
use_editor = 0;
if (edit_flag)
diff --git a/t/t7509-commit.sh b/t/t7509-commit.sh
index 6d9eb26..ec13cea 100755
--- a/t/t7509-commit.sh
+++ b/t/t7509-commit.sh
@@ -3,85 +3,101 @@
# Copyright (c) 2009 Erick Mattos
#
-test_description='git commit
-
-Tests for --claim option on a commit.'
+test_description='git commit --mine'
. ./test-lib.sh
-TEST_FILE="$PWD"/foo
+author_header () {
+ git cat-file commit "$1" |
+ sed -n -e '/^$/q' -e '/^author /p'
+}
+
+message_body () {
+ git cat-file commit "$1" |
+ sed -e '1,/^$/d'
+}
-test_expect_success '-C option should be working' '
- echo "Initial" > "$TEST_FILE" &&
- git add "$TEST_FILE" &&
+test_expect_success '-C option copies authorship and message' '
+ echo "Initial" >foo &&
+ git add foo &&
+ test_tick &&
git commit -m "Initial Commit" --author Frigate\ \<flying@over.world\> &&
- sleep 1 &&
- echo "Test 1" >> "$TEST_FILE" &&
- git add "$TEST_FILE" &&
- git commit -C HEAD &&
- git cat-file -p HEAD^ | sed -e '/^parent/d' -e '/^tree/d' -e '/^committer/d' > commit_1 &&
- git cat-file -p HEAD | sed -e '/^parent/d' -e '/^tree/d' -e '/^committer/d' > commit_2 &&
- cmp commit_1 commit_2
+ git tag Initial &&
+ echo "Test 1" >>foo &&
+ test_tick &&
+ git commit -a -C Initial &&
+ author_header Initial >expect &&
+ author_header HEAD >actual &&
+ test_cmp expect actual
'
-test_expect_success '-C option with --claim is working properly' '
- sleep 1 &&
- echo "Test 2" >> "$TEST_FILE" &&
- git add "$TEST_FILE" &&
- git commit -C HEAD^ --claim &&
- git cat-file -p HEAD^ | grep '^author' > commit_1 &&
- git cat-file -p HEAD | grep '^author' > commit_2 &&
- test_must_fail cmp commit_1 commit_2
+test_expect_success '-C option copies only the message with --mine' '
+ echo "Test 2" >>foo &&
+ test_tick &&
+ git commit -a -C Initial --mine &&
+ echo "author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect &&
+ author_header HEAD >actual
+ test_cmp expect actual &&
+
+ message_body Initial >expect &&
+ message_body HEAD >actual &&
+ test_cmp expect actual
'
-test_expect_success '-c option should be working' '
- echo "Initial" > "$TEST_FILE" &&
- git add "$TEST_FILE" &&
- git commit -m "Initial Commit" --author Frigate\ \<flying@over.world\> &&
- sleep 1 &&
- echo "Test 3" >> "$TEST_FILE" &&
- git add "$TEST_FILE" &&
- git commit -c HEAD <<EOF
- "Changed"
- EOF &&
- git cat-file -p HEAD^ | grep '^author' > commit_1 &&
- git cat-file -p HEAD | grep '^author' > commit_2 &&
- cmp commit_1 commit_2
+test_expect_success '-c option copies authorship and message' '
+ echo "Test 3" >>foo &&
+ test_tick &&
+ EDITOR=: VISUAL=: git commit -a -c Initial &&
+ author_header Initial >expect &&
+ author_header HEAD >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '-c option copies only the message with --mine' '
+ echo "Test 4" >>foo &&
+ test_tick &&
+ EDITOR=: VISUAL=: git commit -a -c Initial --mine &&
+ echo "author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect &&
+ author_header HEAD >actual &&
+ test_cmp expect actual &&
+
+ message_body Initial >expect &&
+ message_body HEAD >actual &&
+ test_cmp expect actual
'
-test_expect_success '-c option with --claim is working properly' '
- sleep 1 &&
- echo "Test 4" >> "$TEST_FILE" &&
- git add "$TEST_FILE" &&
- git commit -c HEAD^ --claim <<EOF
- "Changed again"
- EOF &&
- git cat-file -p HEAD^ | grep '^author' > commit_1 &&
- git cat-file -p HEAD | grep '^author' > commit_2 &&
- test_must_fail cmp commit_1 commit_2
+test_expect_success '--amend option copies authorship' '
+ git checkout Initial &&
+ echo "Test 5" >>foo &&
+ test_tick &&
+ git commit -a --amend -m "amend test" &&
+ author_header Initial >expect &&
+ author_header HEAD >actual &&
+
+ echo "amend test" >expect &&
+ message_body HEAD >actual &&
+ test_cmp expect actual
'
-test_expect_success '--amend option should be working' '
- echo "Initial" > "$TEST_FILE" &&
- git add "$TEST_FILE" &&
- git commit -m "Initial Commit" --author Frigate\ \<flying@over.world\> &&
- echo "Test 5" >> "$TEST_FILE" &&
- git add "$TEST_FILE" &&
- git commit -m "--amend test" &&
- git cat-file -p HEAD | grep '^author' > commit_1 &&
- sleep 1 &&
- git commit -m "Changed" --amend &&
- git cat-file -p HEAD | grep '^author' > commit_2 &&
- cmp commit_1 commit_2
+test_expect_success '--mine makes the commit ours even with --amend option' '
+ git checkout Initial &&
+ echo "Test 6" >>foo &&
+ test_tick &&
+ git commit -a --mine -m "Changed again" --amend &&
+ echo "author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect &&
+ author_header HEAD >actual &&
+ test_cmp expect actual &&
+
+ echo "Changed again" >expect &&
+ message_body HEAD >actual &&
+ test_cmp expect actual
'
-test_expect_success '--amend option with --claim is working properly' '
- sleep 1 &&
- echo "Test 6" >> "$TEST_FILE" &&
- git add "$TEST_FILE" &&
- git commit -m "Changed again" --amend --claim &&
- git cat-file -p HEAD | grep '^author' > commit_1 &&
- test_must_fail cmp commit_1 commit_2
+test_expect_success '--mine and --author are mutually exclusive' '
+ git checkout Initial &&
+ echo "Test 7" >>foo &&
+ test_tick &&
+ test_must_fail git commit -a --mine --author="Xyzzy <frotz@nitfol.xz>"
'
test_done
^ permalink raw reply related
* Re: [PATCH] Makefile: add compat/bswap.h to LIB_H
From: Junio C Hamano @ 2009-11-02 2:59 UTC (permalink / raw)
To: Dmitry V. Levin; +Cc: git
In-Reply-To: <20091101230905.GA15675@wo.int.altlinux.org>
"Dmitry V. Levin" <ldv@altlinux.org> writes:
> Starting with commit 51ea55190b6e72c77c96754c1bf2f149a4714848,
> git-compat-util.h includes compat/bswap.h
>
> Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Thanks.
^ permalink raw reply
* Re: [RFC PATCH 06/19] Factor ref updating out of fetch_with_import
From: Sverre Rabbelier @ 2009-11-02 1:33 UTC (permalink / raw)
To: Daniel Barkalow; +Cc: Git List, Johannes Schindelin, Johan Herland
In-Reply-To: <alpine.LNX.2.00.0910301118070.14365@iabervon.org>
Heya,
On Fri, Oct 30, 2009 at 17:04, Daniel Barkalow <barkalow@iabervon.org> wrote:
> I think you have the sides backwards
Yup, sorry, got them the wrong way around for some reason.
> On the other hand, I think it would make sense to use the same style of
> refspec between the helper and transport-helper.c such that the helper
> reports something like:
>
> refs/svn/origin/trunk:refs/heads/trunkr
> refs/svn/origin/branches/*:refs/heads/*
> refs/svn/origin/tags/*:refs/tags/*
>
> "list" gives:
>
> 000000...000 refs/heads/trunkr
>
> "import refs/heads/trunkr" imports the objects, but the refspecs have to
> be consulted by transport-helper.c in order to determine what ref to read
> to get the value of refs/heads/trunkr. Instead of getting the value with
> read_ref("refs/heads/trunkr", ...) like it does now, it would do
> read_ref("refs/svn/origin/trunk", ...). And systems like p4 that don't
> have a useful standard just wouldn't support the "refspec" command and
> people would have to do site-specific configuration to get anything
> useful.
Yes, that sounds very reasonable, and I think that's the right way to
go. This leaves us with only one thing, we need a remote HEAD for 'git
clone hg::/path/to/repo' to work and have it check out a branch, I
think a seperate 'head' command might be appropriate? If supported it
returns the which local symref (e.g. 'refs/heads/trunkr' in the svn
case) should be pointed at by HEAD. If not supported we can just not
set it and clone will give the default 'no remote HEAD, nothing
checked out' message, which would probably be best for p4?
--
Cheers,
Sverre Rabbelier
^ permalink raw reply
* Re: Fw: git-core: SIGSEGV during {peek,ls}-remote on HTTP remotes.
From: Daniel Barkalow @ 2009-11-02 0:59 UTC (permalink / raw)
To: Jeff King
Cc: Junio C Hamano, Sverre Rabbelier, Samium Gromoff, git,
Tay Ray Chuan, Mike Hommey
In-Reply-To: <20091101230442.GA20264@coredump.intra.peff.net>
On Sun, 1 Nov 2009, Jeff King wrote:
> On Sun, Nov 01, 2009 at 04:19:34PM -0500, Daniel Barkalow wrote:
>
> > > > Do things like git_path() fail cleanly if there was no git directory? If
> > > > not, there should probably be tests of nongit on paths that actually need
> > > > a git directory,...
> > >
> > > I don't know. Again, you tell me ;-)
> >
> > I'm not an expert on that part. But it looks like it misbehaves, returning
> > ".git/foo" even when that path doesn't make sense.
>
> I will not admit to being an expert in that area, but yes, that is what
> I observed before while looking into some of our weird startup problems.
> We really have two systems for setting up the environment:
>
> - setup_git_directory, which tries to do everything at the outset (but
> which we don't necessarily run for all commands, and where "outset"
> is defined as when the git wrapper handles an actual command, which
> means we sometimes do quite a bit of stuff beforehand)
>
> - some lazy magic in environment.c, mostly setup_git_env. If
> setup_git_directory has been run, this does the right thing because
> it reads GIT_DIR from the environment as set previously. But if not,
> then it can quite often do the wrong thing (as you noticed).
>
> I tried simply ditching the lazy magic, but that doesn't work: there are
> many cases where setup_git_directory hasn't been run. Moving it to the
> very beginning doesn't quite work, either. I don't remember the details,
> sadly. It may be that the lazy setup_git_env magic should, rather than
> doing anything itself, call setup_git_directory if it has not been
> initialized. But at that point, you might as well setup_git_directory in
> every program, since just about every one is going to want to look at
> git_path at some point.
>
> Sorry, I know that is vague. Refactoring this area has been on my plate
> for so long that I have forgotten all the details, and it is such a
> messy area that I am continually procrastinating on diving back into it.
> ;)
I've been looking at it, just now, and I might try to clean stuff up. The
problem I'm running into is that, in some cases, you have to call
setup_git_directory_gently(), and it might determine that there is no git
repo, but then the various environment functions don't distinguish between
the situation where you haven't called it at all and the situation where
you called it and determined there to be no answer. Furthermore, a lot of
functions seem to be getting git_path(something), ignoring the fact that
there is no repo, and acting like there is a repo that has simply not got
the file it is looking for.
-Daniel
*This .sig left intentionally blank*
^ permalink raw reply
* Re: [PATCH] commit -c/-C/--amend: acquire authorship and restamp time with --claim
From: Erick Mattos @ 2009-11-02 0:54 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vbpjlycqc.fsf@alter.siamese.dyndns.org>
2009/11/1 Junio C Hamano <gitster@pobox.com>:
> Erick Mattos <erick.mattos@gmail.com> writes:
>
>>> % git commit --claim --author='Erick Mattos <eric@mattos>' -C HEAD
>>>
>>> Should you detect an error? Does your code do so? Do you have a test
>>> that catches this error?
>>
>> It works as intended. Both together.
>
> That does not make any sense. If you are saying this is yours and it is
> his at the same time, there can be no sane way to work "as intended", no?.
I am adding a new option not changing the option --author already in
git. So it does work together.
>>>> + git commit -c HEAD <<EOF
>>>> + "Changed"
>>>> + EOF &&
>>>
>>> What editor is reading this "Changed"?
>>
>> Nobody cares... Just a text to change the file.
>
> I actually care. Who uses that Changed string, and where does it end up
> with? At the end of the log message? At the beginning? What "file"?
>
I didn't get it. -c option does not accept -m option and starts an
editor to change the message. The text "Changed is just a forced
message. I can not use an editor in interactive mode in a script...
What I am losing here??
^ permalink raw reply
* Re: [PATCH] commit -c/-C/--amend: acquire authorship and restamp time with --claim
From: Junio C Hamano @ 2009-11-02 0:47 UTC (permalink / raw)
To: Erick Mattos; +Cc: git
In-Reply-To: <55bacdd30911011257m22ee85f2wc5d51865f7f2aadd@mail.gmail.com>
Erick Mattos <erick.mattos@gmail.com> writes:
>> % git commit --claim --author='Erick Mattos <eric@mattos>' -C HEAD
>>
>> Should you detect an error? Does your code do so? Do you have a test
>> that catches this error?
>
> It works as intended. Both together.
That does not make any sense. If you are saying this is yours and it is
his at the same time, there can be no sane way to work "as intended", no?.
>>> + git commit -c HEAD <<EOF
>>> + "Changed"
>>> + EOF &&
>>
>> What editor is reading this "Changed"?
>
> Nobody cares... Just a text to change the file.
I actually care. Who uses that Changed string, and where does it end up
with? At the end of the log message? At the beginning? What "file"?
^ permalink raw reply
* [PATCH] commit -c/-C/--amend: reset timestamp and authorship to committer with --mine
From: Erick Mattos @ 2009-11-02 0:44 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Erick Mattos
In-Reply-To: <55bacdd30911011514r1be6e09fobe2751588ed5166e@mail.gmail.com>
When we use one of the options above we are normally trying to do mainly
two things: one is using the source as a template and second is to
recreate a commit with corrections.
When they are used, the authorship and timestamp recorded in the newly
created commit is always taken from the original commit. And they
should not when we are using it as a template.
The new --mine option is meant to solve this need by regenerating the
timestamp and setting as new author the committer or the one specified
on --author option.
Signed-off-by: Erick Mattos <erick.mattos@gmail.com>
---
Documentation/git-commit.txt | 8 +++-
builtin-commit.c | 9 +++-
t/t7509-commit.sh | 98 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 111 insertions(+), 4 deletions(-)
create mode 100755 t/t7509-commit.sh
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 0578a40..eae5bf4 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -9,7 +9,7 @@ SYNOPSIS
--------
[verse]
'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend] [--dry-run]
- [(-c | -C) <commit>] [-F <file> | -m <msg>]
+ [(-c | -C) <commit>] [-F <file> | -m <msg>] [--mine]
[--allow-empty] [--no-verify] [-e] [--author=<author>]
[--cleanup=<mode>] [--] [[-i | -o ]<file>...]
@@ -69,6 +69,12 @@ OPTIONS
Like '-C', but with '-c' the editor is invoked, so that
the user can further edit the commit message.
+--mine::
+ When used with -C/-c/--amend options, declare that the
+ authorship of the resulting commit now belongs of the committer.
+ This also renews the author timestamp. Therefore this option
+ sets the use of only the message from the original commit.
+
-F <file>::
--file=<file>::
Take the commit message from the given file. Use '-' to
diff --git a/builtin-commit.c b/builtin-commit.c
index c395cbf..17a6794 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -51,7 +51,7 @@ static const char *template_file;
static char *edit_message, *use_message;
static char *author_name, *author_email, *author_date;
static int all, edit_flag, also, interactive, only, amend, signoff;
-static int quiet, verbose, no_verify, allow_empty, dry_run;
+static int quiet, verbose, no_verify, allow_empty, dry_run, mine;
static char *untracked_files_arg;
/*
* The default commit message cleanup mode will remove the lines
@@ -91,8 +91,9 @@ static struct option builtin_commit_options[] = {
OPT_FILENAME('F', "file", &logfile, "read log from file"),
OPT_STRING(0, "author", &force_author, "AUTHOR", "override author for commit"),
OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m),
- OPT_STRING('c', "reedit-message", &edit_message, "COMMIT", "reuse and edit message from specified commit "),
+ OPT_STRING('c', "reedit-message", &edit_message, "COMMIT", "reuse and edit message from specified commit"),
OPT_STRING('C', "reuse-message", &use_message, "COMMIT", "reuse message from specified commit"),
+ OPT_BOOLEAN(0, "mine", &mine, "reset timestamp and authorship to committer"),
OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"),
OPT_FILENAME('t', "template", &template_file, "use specified template file"),
OPT_BOOLEAN('e', "edit", &edit_flag, "force edit of commit"),
@@ -381,7 +382,7 @@ static void determine_author_info(void)
email = getenv("GIT_AUTHOR_EMAIL");
date = getenv("GIT_AUTHOR_DATE");
- if (use_message) {
+ if (use_message && !mine) {
const char *a, *lb, *rb, *eol;
a = strstr(use_message_buffer, "\nauthor ");
@@ -778,6 +779,8 @@ static int parse_and_validate_options(int argc, const char *argv[],
use_message = edit_message;
if (amend && !use_message)
use_message = "HEAD";
+ if (!use_message && mine)
+ die("Option --mine is used only with -C/-c/--amend.");
if (use_message) {
unsigned char sha1[20];
static char utf8[] = "UTF-8";
diff --git a/t/t7509-commit.sh b/t/t7509-commit.sh
new file mode 100755
index 0000000..514de6a
--- /dev/null
+++ b/t/t7509-commit.sh
@@ -0,0 +1,98 @@
+#!/bin/sh
+#
+# Copyright (c) 2009 Erick Mattos
+#
+
+test_description='git commit
+
+Tests for --mine option on a commit.'
+
+. ./test-lib.sh
+
+TEST_FILE=foo
+
+test_expect_success '-C without --mine uses the author from the old commit' '
+ echo "initial" > "$TEST_FILE" &&
+ git add "$TEST_FILE" &&
+ git commit -m "Initial Commit" --author "Frigate <flying@over.world>" &&
+ test_tick &&
+ echo "Test 1" >> "$TEST_FILE" &&
+ git add "$TEST_FILE" &&
+ git commit -C HEAD &&
+ git cat-file -p HEAD^ | sed -e "/^parent/d" -e "/^tree/d" \
+ -e "/^committer/d" > commit_1 &&
+ git cat-file -p HEAD | sed -e "/^parent/d" -e "/^tree/d" \
+ -e "/^committer/d" > commit_2 &&
+ test_cmp commit_1 commit_2
+'
+
+test_expect_success '-C with --mine makes me the author' '
+ test_tick &&
+ echo "Test 2" >> "$TEST_FILE" &&
+ git add "$TEST_FILE" &&
+ git commit -C HEAD^ --mine &&
+ git cat-file -p HEAD^ | grep "^author" > commit_1 &&
+ git cat-file -p HEAD | grep "^author" > commit_2 &&
+ test "$(cat commit_1 | sed "s/.*> //")" !=\
+ "$(cat commit_2 | sed "s/.*> //")" &&
+ test "$(cat commit_2 | sed -e "s/author //" -e "s/>.*/>/")" =\
+ "$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>"
+'
+
+test_expect_success '-c without --mine uses the author from the old commit' '
+ echo "Initial" > "$TEST_FILE" &&
+ git add "$TEST_FILE" &&
+ git commit -m "Initial Commit" --author "Frigate <flying@over.world>" &&
+ test_tick &&
+ echo "Test 3" >> "$TEST_FILE" &&
+ git add "$TEST_FILE" &&
+ git commit -c HEAD <<EOF
+ "Changed"
+ EOF &&
+ git cat-file -p HEAD^ | grep "^author" > commit_1 &&
+ git cat-file -p HEAD | grep "^author" > commit_2 &&
+ test_cmp commit_1 commit_2
+'
+
+test_expect_success '-c with --mine makes me the author' '
+ test_tick &&
+ echo "Test 4" >> "$TEST_FILE" &&
+ git add "$TEST_FILE" &&
+ git commit -c HEAD^ --mine <<EOF
+ "Changed again"
+ EOF &&
+ git cat-file -p HEAD^ | grep "^author" > commit_1 &&
+ git cat-file -p HEAD | grep "^author" > commit_2 &&
+ test "$(cat commit_1 | sed "s/.*> //")" !=\
+ "$(cat commit_2 | sed "s/.*> //")" &&
+ test "$(cat commit_2 | sed -e "s/author //" -e "s/>.*/>/")" =\
+ "$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>"
+'
+
+test_expect_success '--amend without --mine uses the author from the old commit' '
+ echo "Initial" > "$TEST_FILE" &&
+ git add "$TEST_FILE" &&
+ git commit -m "Initial Commit" --author "Frigate <flying@over.world>" &&
+ echo "Test 5" >> "$TEST_FILE" &&
+ git add "$TEST_FILE" &&
+ git commit -m "--amend test" &&
+ git cat-file -p HEAD | grep "^author" > commit_1 &&
+ test_tick &&
+ git commit -m "Changed" --amend &&
+ git cat-file -p HEAD | grep "^author" > commit_2 &&
+ test_cmp commit_1 commit_2
+'
+
+test_expect_success '--amend with --mine makes me the author' '
+ test_tick &&
+ echo "Test 6" >> "$TEST_FILE" &&
+ git add "$TEST_FILE" &&
+ git commit -m "Changed again" --amend --mine &&
+ git cat-file -p HEAD | grep "^author" > commit_1 &&
+ test "$(cat commit_1 | sed "s/.*> //")" !=\
+ "$(cat commit_2 | sed "s/.*> //")" &&
+ test "$(cat commit_2 | sed -e "s/author //" -e "s/>.*/>/")" =\
+ "$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>"
+'
+
+test_done
--
1.6.5.2.102.gdbd78.dirty
^ permalink raw reply related
* [PATCH] Makefile: add compat/bswap.h to LIB_H
From: Dmitry V. Levin @ 2009-11-01 23:09 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
Starting with commit 51ea55190b6e72c77c96754c1bf2f149a4714848,
git-compat-util.h includes compat/bswap.h
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
---
Makefile | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
index 268aede..3bca8d4 100644
--- a/Makefile
+++ b/Makefile
@@ -412,6 +412,7 @@ LIB_H += builtin.h
LIB_H += cache.h
LIB_H += cache-tree.h
LIB_H += commit.h
+LIB_H += compat/bswap.h
LIB_H += compat/cygwin.h
LIB_H += compat/mingw.h
LIB_H += csum-file.h
--
ldv
^ permalink raw reply related
* [PATCH] Update packfile transfer protocol documentation
From: Scott Chacon @ 2009-11-01 23:18 UTC (permalink / raw)
To: git list; +Cc: Shawn O. Pearce, Junio C Hamano
The technical documentation for the packfile protocol is both sparse and
incorrect. This documents the fetch-pack/upload-pack and send-pack/
receive-pack protocols much more fully.
Add documentation from Shawn's upcoming http-protocol docs that is shared
by the packfile protocol. protocol-common.txt describes ABNF notation
amendments, refname rules and the packet line format.
Add documentation on the various capabilities supported by the
upload-pack and receive-pack protocols. protocol-capabilities.txt describes
multi-ack, thin-pack, side-band[-64k], shallow, no-progress, include-tag,
ofs-delta, delete-refs and report-status.
Signed-Off-By: Scott Chacon <schacon@gmail.com>
---
I've incorporated the comments from Shawn (except for the 'annotated
tag' comment
in the 'include-tag' section of the capabilities doc, which I didn't
understand). I also
fixed the whitespace issues that were in most of the ABNF sections.
Documentation/technical/pack-protocol.txt | 529 +++++++++++++++++++--
Documentation/technical/protocol-capabilities.txt | 188 ++++++++
Documentation/technical/protocol-common.txt | 96 ++++
3 files changed, 772 insertions(+), 41 deletions(-)
create mode 100644 Documentation/technical/protocol-capabilities.txt
create mode 100644 Documentation/technical/protocol-common.txt
diff --git a/Documentation/technical/pack-protocol.txt
b/Documentation/technical/pack-protocol.txt
index 9cd48b4..1cc61d8 100644
--- a/Documentation/technical/pack-protocol.txt
+++ b/Documentation/technical/pack-protocol.txt
@@ -1,41 +1,488 @@
-Pack transfer protocols
-=======================
-
-There are two Pack push-pull protocols.
-
-upload-pack (S) | fetch/clone-pack (C) protocol:
-
- # Tell the puller what commits we have and what their names are
- S: SHA1 name
- S: ...
- S: SHA1 name
- S: # flush -- it's your turn
- # Tell the pusher what commits we want, and what we have
- C: want name
- C: ..
- C: want name
- C: have SHA1
- C: have SHA1
- C: ...
- C: # flush -- occasionally ask "had enough?"
- S: NAK
- C: have SHA1
- C: ...
- C: have SHA1
- S: ACK
- C: done
- S: XXXXXXX -- packfile contents.
-
-send-pack | receive-pack protocol.
-
- # Tell the pusher what commits we have and what their names are
- C: SHA1 name
- C: ...
- C: SHA1 name
- C: # flush -- it's your turn
- # Tell the puller what the pusher has
- S: old-SHA1 new-SHA1 name
- S: old-SHA1 new-SHA1 name
- S: ...
- S: # flush -- done with the list
- S: XXXXXXX --- packfile contents.
+Packfile transfer protocols
+===========================
+
+Git supports transferring data in packfiles over the ssh://, git:// and
+file:// transports. There exist two sets of protocols, one for pushing
+data from a client to a server and another for fetching data from a
+server to a client. All three transports (ssh, git, file) use the same
+protocol to transfer data.
+
+The processes invoked in the canonical Git implementation are 'upload-pack'
+on the server side and 'fetch-pack' on the client side for fetching data;
+then 'receive-pack' on the server and 'send-pack' on the client for pushing
+data. The protocol functions to have a server tell a client what is
+currently on the server, then for the two to negotiate the smallest amount
+of data to send in order to fully update one or the other.
+
+Transports
+----------
+There are three transports over which the packfile protocol is
+initiated. The Git transport is a simple, unauthenticated server that
+simply takes the command (almost always 'upload-pack', though Git
+servers can be configured to be globally writable, in which 'receive-
+pack' initiation is also allowed) with which the client wishes to
+communicate and executes it and connects it to the requesting
+process.
+
+In the SSH transport, the client basically just runs the 'upload-pack'
+or 'receive-pack' process on the server over the SSH protocol and then
+communicates with that invoked process over the SSH connection.
+
+The file:// transport simply runs the 'upload-pack' or 'receive-pack'
+process locally and communicates with it over a pipe.
+
+Git Protocol
+------------
+
+The Git protocol starts off by sending "git-receive-pack 'repo.git'"
+on the wire using the pkt-line format, followed by a null byte and a
+hostname paramater, terminated by a null byte.
+
+ 0032git-upload-pack /project.git\0host=myserver.com\0
+
+--
+ git-proto-request = request-command SP pathname NUL [ host-parameter NUL ]
+ request-command = "git-upload-pack" / "git-receive-pack" /
+ "git-upload-archive" ; case sensitive
+ pathname = *( %x01-ff ) ; exclude NUL
+ host-parameter = "host=" hostname [ ":" port ]
+--
+
+Only host-parameter is allowed in the git-proto-request. Clients
+MUST NOT attempt to send additional parameters. It is used for the
+git-daemon name based virtual hosting. See --interpolated-path
+option to git daemon, with the %H/%CH format characters.
+
+Basically what the Git client is doing to connect to an 'upload-pack'
+process on the server side over the Git protocol is this:
+
+ $ echo -e -n \
+ "0039git-upload-pack /schacon/gitbook.git\0host=example.com\0" |
+ nc -v example.com 9418
+
+
+SSH Protocol
+------------
+
+Initiating the upload-pack or receive-pack processes over SSH is
+simply executing the binary on the server via SSH remote execution.
+It is basically equivalent to running this:
+
+ $ ssh git.example.com "git-upload-pack '/project.git'"
+
+For a server to support Git pushing and pulling for a given user over
+SSH, that user needs to be able to execute one or both of those
+commands via the SSH shell that they are provided on login. On some
+systems, that shell access is limited to only being able to run those
+two commands, or even just one of them.
+
+In an ssh:// format URI, it's absolute in the URI, so the '/' after
+the host name (or port number) is sent as an argument, which is then
+read by the remote git-upload-pack exactly as is, so it's effectively
+an absolute path in the remote filesystem.
+
+ git clone ssh://user@example.com/project.git
+ |
+ v
+ ssh user@example.com "git-upload-pack '/project.git'"
+
+In a "user@host:path" format URI, its relative to the user's home
+directory, because the Git client will run:
+
+ git clone user@example.com:project.git
+ |
+ v
+ ssh user@example.com "git-upload-pack 'project.git'"
+
+The exception is if a '~' is used, in which case
+we execute it without the leading '/'.
+
+ ssh://user@example.com/~alice/project.git,
+ |
+ v
+ ssh user@example.com "git-upload-pack '~alice/project.git'"
+
+Fetching Data From a Server
+===========================
+
+When one Git repository wants to get all the data that a second
+repository has, the first can 'fetch' from the second. This
+operation determines what data the server has that the client does
+not then streams that data down to the client in packfile format.
+
+The server side binaries need to be executable as 'git-upload-pack'
+for fetching and 'git-receive-pack' for pushing over SSH, since the
+Git clients will connect to the server and attempt to run that command
+directly. Over the Git protocol, one could write their own daemon
+that sees that the client is trying to invoke those commands and
+simply handle the requests.
+
+
+Reference Discovery
+-------------------
+
+When the client initially connects the server will immediately respond
+with a listing of each reference it has (all branches and tags) along
+with the commit SHA that each reference currently points to.
+
+ $ echo -e -n \
+ "0039git-upload-pack /schacon/gitbook.git\0host=example.com\0" |
+ nc -v example.com 9418
+ 00887217a7c7e582c46cec22a130adf4b9d7d950fba0 HEAD\0multi_ack \
+ thin-pack side-band side-band-64k ofs-delta shallow no-progress \
+ include-tag
+ 00441d3fcd5ced445d1abc402225c0b8a1299641f497 refs/heads/integration
+ 003f7217a7c7e582c46cec22a130adf4b9d7d950fba0 refs/heads/master
+ 003cb88d2441cac0977faf98efc80305012112238d9d refs/tags/v0.9
+ 003c525128480b96c89e6418b1e40909bf6c5b2d580f refs/tags/v1.0
+ 003fe92df48743b7bc7d26bcaabfddde0a1e20cae47c refs/tags/v1.0^{}
+ 0000
+
+Server SHOULD terminate each non-flush line
+using LF ("\n") terminator; client MUST NOT complain if there is no
+terminator.
+
+The returned response is a pkt-line stream describing each ref and
+its known value. The stream SHOULD be sorted by name according to
+the C locale ordering. The stream SHOULD include the default ref
+named 'HEAD' as the first ref. The stream MUST include capability
+declarations behind a NUL on the first ref.
+
+----
+ advertised-refs = (no-refs / list-of-refs)
+ flush-pkt
+
+ no-refs = PKT-LINE(zero-id SP "capabilities^{}"
+ NUL capability-list LF)
+
+ list-of-refs = first-ref *other-ref
+ first-ref = PKT-LINE(obj-id SP refname
+ NUL capability-list LF)
+
+ other-ref = PKT-LINE(other-tip / other-peeled)
+ other-tip = obj-id SP refname LF
+ other-peeled = obj-id SP refname "^{}" LF
+
+ capability-list = capability *(SP capability)
+ capability = 1*(ALPHA / DIGIT / "-" / "_")
+----
+
+Server and client SHOULD use lowercase for SHA1, both MUST treat SHA1
+as case-insensitive.
+
+See protocol-capabilities.txt for a list of allowed server capabilities
+and descriptions.
+
+Packfile Negotiation
+--------------------
+After reference and capabilities discovery, the client can decide
+to terminate the connection by sending a flush-pkt, telling the
+server it can now gracefully terminate (as happens with the ls-remote
+command) or it can enter the negotiation phase, where the client and
+server determine what the minimal packfile necessary for transport is.
+
+Once the client has the initial list of references that the server
+has, as well as the list of capabilities, it will begin telling the
+server what objects it wants and what objects it has, so the server
+can make a packfile that only has the objects that the client needs.
+The client will also send a list of the capabilities it supports out
+of what the server said it could do with the first 'want' statement.
+
+----
+ upload-request = want-list
+ have-list
+ compute-end
+
+ want-list = first-want
+ *additional-want
+ flush-pkt
+
+ first-want = PKT-LINE("want" SP obj-id SP capability-list LF)
+ additional-want = PKT-LINE("want" SP obj-id LF)
+
+ have-list = *have-line
+ have-line = PKT-LINE("have" SP obj-id LF)
+ compute-end = flush-pkt / PKT-LINE("done")
+----
+
+Clients MUST send all the SHAs it wants from the reference
+discovery phase as 'want' lines. Clients MUST send at least one
+'want' command in the request body. Clients MUST NOT mention an
+obj-id in a 'want' command which did not appear in the response
+obtained through ref discovery.
+
+If client is requesting a shallow clone, it will now send a 'deepen'
+command with the depth it is requesting.
+
+Once all the "want"s (and optional 'deepen') are transferred,
+clients MUST send a flush. If the client has all the references on
+the server, client simply flushes and disconnects.
+
+TODO: shallow/unshallow response and document the deepen command in the ABNF.
+
+Now the client will send a list of the obj-ids it has. In multi_ack
+mode, the canonical implementation will send up to 32 of these at a
+time, then will send a flush-pkt. The canonical implementation will
+also skip ahead and send the next 32 immediately, so that there is
+always a block of 32 "in-flight on the wire" at a time.
+
+If the client has no objects (as in the case of a non-referencing
+clone), it will skip this phase, just send it's 'done' and wait for
+the packfile.
+
+If the server reads 'have' lines, it then will respond by ACKing any
+of the obj-ids the client said it had that the server also has. The
+server will ACK obj-ids differently depending on which ack mode is
+signaled by the client.
+
+In multi_ack mode:
+
+ * the server will respond with 'ACK obj-id continue' for any common
+ commits.
+
+ * once the server has found an acceptable common base commit and is
+ ready to make a packfile, it will blindly ACK all 'have' obj-ids
+ back to the client.
+
+ * the server will then send a 'NACK' and then wait for another response
+ from the client - either a 'done' or another list of 'have' lines.
+
+In multi_ack_detailed mode:
+
+ * the server will differentiate the ACKs where it is simply signaling
+ that it is ready to send data with 'ACK obj-id ready' lines, and
+ signals the identified common commits with 'ACK obj-id common' lines.
+
+Without multi_ack:
+
+ * upload-pack sends "ACK obj-id" on the first common object it finds.
+ After that it says nothing until the client gives it a "done".
+
+ * upload-pack sends "NAK" on a flush-pkt if no common object
+ has been found yet. If one has been found, and thus an ACK
+ was already sent, its silent on the flush-pkt.
+
+After the client has gotten enough ACK responses that it can determine
+that the server has enough information to send an efficient packfile
+(in the canonical implementation, this is determined when it has received
+enough ACKs that it can color everything left in the --date-order queue
+as common with the server, or the --date-order queue is empty), or the
+client determines that it wants to give up (in the canonical implementation,
+this is determined when the client sends 256 'have' lines without getting
+any of them ACKed by the server - meaning there is nothing in common and
+the server should just send all it's objects), then the client will send
+a 'done' command. The 'done' command signals to the server that the client
+is ready to receive it's packfile data.
+
+However, the 256 limit *only* turns on in the canonical client
+implementation if we have received at least one "ACK %s continue"
+during a prior round. This helps to ensure that at least one common
+ancestor is found before we give up entirely.
+
+Once the 'done' line is read from the client, the server will either
+send a final 'ACK obj-id' or it will send a 'NAK'. The server only sends
+ACK after 'done' if there is at least one common base and multi_ack or
+multi_ack_detailed is enabled. The server always sends NAK after 'done'
+if there is no common base found.
+
+Then the server will start sending it's packfile data.
+
+----
+ server-response = *ack_multi ack / nak
+ ack_multi = PKT-LINE("ACK" SP obj-id ack_status LF)
+ ack_status = "continue" / "common" / "ready"
+ ack = PKT-LINE("ACK SP obj-id LF)
+ nak = PKT-LINE("NAK" LF)
+----
+
+A simple clone may look like this (with no 'have' statements):
+
+----
+ C: 0054want 74730d410fcb6603ace96f1dc55ea6196122532d\0multi_ack \
+ side-band-64k ofs-delta\n
+ C: 0032want 7d1665144a3a975c05f1f43902ddaf084e784dbe\n
+ C: 0032want 5a3f6be755bbb7deae50065988cbfa1ffa9ab68a\n
+ C: 0032want 7e47fe2bd8d01d481f44d7af0531bd93d3b21c01\n
+ C: 0032want 74730d410fcb6603ace96f1dc55ea6196122532d\n
+ C: 0000
+ C: 0009done\n
+
+ S: 0008NAK\n
+ S: [PACKFILE]
+----
+
+An incremental update (fetch) response might look like this:
+
+----
+ C: 0054want 74730d410fcb6603ace96f1dc55ea6196122532d\0multi_ack \
+ side-band-64k ofs-delta\n
+ C: 0032want 7d1665144a3a975c05f1f43902ddaf084e784dbe\n
+ C: 0032want 5a3f6be755bbb7deae50065988cbfa1ffa9ab68a\n
+ C: 0000
+ C: 0032have 7e47fe2bd8d01d481f44d7af0531bd93d3b21c01\n
+ C: [30 more have lines]
+ C: 0032have 74730d410fcb6603ace96f1dc55ea6196122532d\n
+ C: 0000
+
+ S: 003aACK 7e47fe2bd8d01d481f44d7af0531bd93d3b21c01 continue\n
+ S: 003aACK 74730d410fcb6603ace96f1dc55ea6196122532d continue\n
+ S: 0008NAK\n
+
+ C: 0009done\n
+
+ S: 003aACK 74730d410fcb6603ace96f1dc55ea6196122532d\n
+ S: [PACKFILE]
+----
+
+
+Packfile Data
+-------------
+
+Now that the client and server have done some negotiation about what
+the minimal amount of data that can be sent to the client is, the server
+will construct and send the required data in packfile format.
+
+See pack-format.txt for what the packfile itself actually looks like.
+
+If 'side-band' or 'side-band-64k' capabilities have been specified by
+the client, the server will send the packfile data multiplexed.
+
+Each packet starting with the packet-line length of the amount of data
+that follows, followed by a single byte specifying the sideband the
+following data is coming in on.
+
+In 'side-band' mode, it will send 999 data bytes plus 1 control code,
+for a total of 1000 bytes in a pkt-line. In 'side-band-64k' mode it
+will send 65519 data bytes plus 1 control code, for a total of 65520
+bytes in a pkt-line.
+
+The sideband byte will be either a '1' or a '2'. Sideband '1' will contain
+packfile data, sideband '2' will be used for progress information that the
+client will generally print to stderr.
+
+If no 'side-band' capability was specified, the server will simply
+stream the entire packfile without multiplexing.
+
+
+Pushing Data To a Server
+========================
+
+Pushing data to a server will invoke the 'receive-pack' process on the
+server, which will allow the client to tell it which references it should
+update and then send all the data the server will need for those new
+references to be complete. Once all the data is received and validated,
+the server will then update it's references to what the client specified.
+
+Authentication
+--------------
+
+The protocol itself contains no authentication mechanisms. That is to be
+handled by the transport, such as SSH, before the 'receive-pack' process is
+invoked. If 'receive-pack' is configured over the Git transport, those
+repositories will be writable by anyone who can access that port (9418) as
+that transport is unauthenticated.
+
+Reference Discovery
+-------------------
+
+The reference discovery phase is done nearly the same way as it is in the
+fetching protocol. Each reference obj-id and name on the server is sent
+in packet-line format to the client, followed by a flush packet. The only
+real difference is that the capability listing is different - the only
+possible values are 'report-status', 'delete-refs' and 'ofs-delta'.
+
+Reference Update Request and Packfile Transfer
+----------------------------------------------
+
+Once the client knows what references the server is at, it can send a
+list of reference update requests. For each reference on the server
+that it wants to update, it sends a line listing the obj-id currently on
+the server, the obj-id the client would like to update it to and the name
+of the reference.
+
+This list is followed by a flush packet and then the packfile that should
+contain all the objects that the server will need to complete the new
+references.
+
+The pack-file MUST NOT be sent if the only command used is 'delete'.
+
+A pack-file MUST be sent if either create or update command is used.
+An empty pack-file MUST be sent if a create or update command is
+used, and the server already obviously has the object (e.g. the
+SHA-1 is already pointed to by another ref that was listed in the
+advertisement).
+
+----
+ update-request = command-list [pack-file]
+
+ command-list = PKT-LINE(command NUL capability-list LF)
+ *PKT-LINE(command LF)
+ flush-pkt
+
+ command = create / delete / update
+ create = zero-id SP new-id SP name
+ delete = old-id SP zero-id SP name
+ update = old-id SP new-id SP name
+
+ old-id = obj-id
+ new-id = obj-id
+
+ pack-file = "PACK" 24*(OCTET)
+----
+
+The server will receive the packfile, unpack it, then validate each
+reference that is being updated that it hasn't changed while the request
+was being processed (the obj-id is still the same as the old-id), and
+it will run any update hooks to make sure that the update is acceptable.
+If all of that is fine, the server will then update the references.
+
+Report Status
+-------------
+
+If the 'report-status' capability is sent by the client, then the server
+will send a short report of what happened in that update. It will first
+list the status of the packfile unpacking as either 'unpack ok' or
+'unpack [error]'. Then it will list the status for each of the references
+that it tried to update. Each line be either 'ok [refname]' if the
+update was successful, or 'ng [refname] [error]' if the update was not.
+
+----
+ report-status = unpack-status
+ 1*(command-status)
+ flush-pkt
+
+ unpack-status = PKT-LINE("unpack" SP unpack-result LF)
+ unpack-result = "ok" / error-msg
+
+ command-status = command-ok / command-fail
+ command-ok = PKT-LINE("ok" SP refname LF)
+ command-fail = PKT-LINE("ng" SP refname SP error-msg LF)
+
+ error-msg = 1*(OCTECT) ; where not "ok"
+----
+
+Updates can be unsuccessful for a number of reasons. The reference can have
+changed since the reference discovery phase was originally sent, meaning
+someone pushed in the meantime. The reference being pushed could be a
+non-fast-forward reference and the update hooks or configuration could be
+set to not allow that, etc. Also, some references can be updated while others
+can be rejected.
+
+An example client/server communication might look like this:
+
+----
+ S: 007c74730d410fcb6603ace96f1dc55ea6196122532d
refs/heads/local\0report-status delete-refs ofs-delta\n
+ S: 003e7d1665144a3a975c05f1f43902ddaf084e784dbe refs/heads/debug\n
+ S: 003f74730d410fcb6603ace96f1dc55ea6196122532d refs/heads/master\n
+ S: 003f74730d410fcb6603ace96f1dc55ea6196122532d refs/heads/team\n
+ S: 0000
+
+ C: 003e7d1665144a3a975c05f1f43902ddaf084e784dbe
74730d410fcb6603ace96f1dc55ea6196122532d refs/heads/debug\n
+ C: 003e74730d410fcb6603ace96f1dc55ea6196122532d
5a3f6be755bbb7deae50065988cbfa1ffa9ab68a refs/heads/master\n
+ C: 0000
+ C: [PACKDATA]
+
+ S: 000aunpack ok\n
+ S: 0014ok refs/heads/debug\n
+ S: 0026ng refs/heads/master non-fast-forward\n
+----
diff --git a/Documentation/technical/protocol-capabilities.txt
b/Documentation/technical/protocol-capabilities.txt
new file mode 100644
index 0000000..3c86fc3
--- /dev/null
+++ b/Documentation/technical/protocol-capabilities.txt
@@ -0,0 +1,188 @@
+Git Protocol Capabilities
+=========================
+
+Servers SHOULD support all capabilities defined in this document.
+
+On the very first line of the initial server response, the first
+reference is followed by a null byte and then a list of space
+delimited server capabilities. These allow the server to declare
+what it can and cannot do to the client.
+
+Client sends space separated list of capabilities it wants. It
+SHOULD send a subset of server capabilities, i.e do not send
+capabilities served does not advertise. The client SHOULD NOT ask
+for capabilities the server did not say it supports.
+
+Server MUST ignore capabilities it does not understand. Server MUST
+NOT ignore capabilities that client requested and server advertised.
+
+The 'report-status' and 'delete-refs' capabilities are sent and
+recognized by the receive-pack (push to server) process.
+
+The 'ofs-delta' capability is sent and recognized by both upload-pack
+and receive-pack protocols.
+
+All other capabilities are only recognized by the upload-pack (fetch
+from server) process.
+
+multi_ack
+---------
+
+The 'multi_ack' capability allows the server to return "ACK $SHA1
+continue" as soon as it finds a commit that it can use as a common
+base, between the client's wants and the client's have set.
+
+By sending this early, the server can potentially head off the client
+from walking any further down that particular branch of the client's
+repository history. The client may still need to walk down other
+branches, sending have lines for those, until the server has a
+complete cut across the DAG, or the client has said "done".
+
+Without multi_ack, a client sends have lines in --date-order until
+the server has found a common base. That means the client will send
+have lines that are already known by the server to be common, because
+they overlap in time with another branch that the server hasn't found
+a common base on yet.
+
+The client has things in caps that the server doesn't; server has
+things in lower case.
+
+ +---- u ---------------------- x
+ / +----- y
+ / /
+ a -- b -- c -- d -- E -- F
+ \
+ +--- Q -- R -- S
+
+If the client wants x,y and starts out by saying have F,S, the server
+doesn't know what F,S is. Eventually the client says "have d" and
+the server sends "ACK d continue" to let the client know to stop
+walking down that line (so don't send c-b-a), but its not done yet,
+it needs a base for X. The client keeps going with S-R-Q, until a
+gets reached, at which point the server has a clear base and it all
+ends.
+
+Without multi_ack the client would have sent that c-b-a chain anyway,
+interleaved with S-R-Q.
+
+thin-pack
+---------
+
+Server can send thin packs, i.e. packs which do not contain base
+elements, if those base elements are available on clients side.
+Client requests thin-pack capability when it understands how to "thicken"
+them adding required delta bases making them independent.
+
+Client MUST NOT request 'thin-pack' capability if it
+cannot turn thin packs into proper independent packs.
+
+
+side-band, side-band-64k
+------------------------
+
+This means that server can send, and client understand multiplexed
+(muxed) progress reports and error info interleaved with the packfile
+itself.
+
+These two options are mutually exclusive. A client should ask for
+only one of them, and a modern client always favors side-band-64k.
+
+Either mode indicates that the packfile data will be streamed broken
+up into packets of either 1000 bytes in the case of 'side_band', or
+65520 bytes in the case of 'side_band_64k'. Each packet is made up of
+a leading 4-byte pkt-line length of how much data is in the packet,
+followed by a 1-byte stream code, followed by the actual data.
+
+The stream code can be one of:
+
+ 1 - pack data
+ 2 - progress messages
+ 3 - fatal error message just before stream aborts
+
+The "side-band-64k" capability came about as a way for newer clients
+that can handle much larger packets to request packets that are
+actually crammed nearly full, while maintaining backward compatibility
+for the older clients.
+
+Further, with side-band and its 1000 byte messages, it's actually
+999 bytes of payload and 1 byte for the stream code. With side-band-64k,
+same deal, you have 65519 bytes of data and 1 byte for the stream code.
+
+The client MUST send only maximum of one of "side-band" and "side-
+band-64k". Server MUST favor side-band-64k if client requests both.
+
+ofs-delta
+---------
+
+Server can send, and client understand PACKv2 with delta refering to
+its base by position in pack rather than by SHA-1. Its that they can
+send/read OBJ_OFS_DELTA, aka type 6 in a pack file.
+
+shallow
+-------
+
+This capability adds "deepen", "shallow" and "unshallow" commands to
+the fetch-pack/upload-pack protocol so clients can request shallow
+clones.
+
+no-progress
+-----------
+
+The client was started with "git clone -q" or something, and doesn't
+want that side band 2. Basically the client just says "I do not
+wish to receive stream 2 on sideband, so do not send it to me, and if
+you did, I will drop it on the floor anyway". However, the sideband
+channel 3 is still used for error responses.
+
+include-tag
+-----------
+
+The 'include-tag' capability is about sending tags if we are sending
+objects they point to. If we pack an object to the client, and a tag
+points exactly at that object, we pack the tag too. In general this
+allows a client to get all new tags when it fetches a branch, in a
+single network connection.
+
+Clients MAY always send include-tag, hardcoding it into a request.
+The decision for a client to request include-tag only has to do with
+the client's desires for tag data, whether or not a server had
+advertised objects in the refs/tags/* namespace.
+
+Clients SHOULD NOT send include-tag if remote.name.tagopt was set to
+--no-tags, as the client doesn't want tag data.
+
+Servers MUST accept include-tag without error or warning, even if the
+server does not understand or support the option.
+
+Servers SHOULD pack the tags if their referrant is packed and the
+client has requested include-tag.
+
+Clients MUST be prepared for the case where a server has ignored
+include-tag and has not actually sent tags in the pack. In such
+cases the client SHOULD issue a subsequent fetch to acquire the tags
+that include-tag would have otherwise given the client.
+
+The server SHOULD send include-tag, if it supports it, irregardless
+of whether or not there are tags available.
+
+report-status
+-------------
+
+The upload-pack process can receive a 'report-status' capability,
+which tells it that the client wants a report of what happened after
+a packfile upload and reference update. If the pushing client requests
+this capability, after unpacking and updating references the server
+will respond with whether the packfile unpacked successfully and if
+each reference was updated successfully. If any of those were not
+successful, it will send back an error message. See pack-protocol.txt
+for example messages.
+
+delete-refs
+-----------
+
+If the server sends back the 'delete-refs' capability, it means that
+it is capable of accepting an all-zeroed SHA-1 value as the target
+value of a reference update. It is not sent back by the client, it
+simply informs the client that it can be sent zeroed SHA-1 values
+to delete references.
+
diff --git a/Documentation/technical/protocol-common.txt
b/Documentation/technical/protocol-common.txt
new file mode 100644
index 0000000..ddf9912
--- /dev/null
+++ b/Documentation/technical/protocol-common.txt
@@ -0,0 +1,96 @@
+Documentation Common to Pack and Http Protocols
+===============================================
+
+ABNF Notation
+-------------
+
+ABNF notation as described by RFC 5234 is used within the protocol documents,
+except the following replacement core rules are used:
+----
+ HEXDIG = DIGIT / "a" / "b" / "c" / "d" / "e" / "f"
+----
+
+We also define the following common rules:
+----
+ NUL = %x00
+ zero-id = 40*"0"
+ obj-id = 40*(HEXDIGIT)
+
+ refname = "HEAD"
+ refname /= "refs/" <see discussion below>
+----
+
+A refname is a hierarichal octet string beginning with "refs/" and
+not violating the 'git-check-ref-format' command's validation rules.
+More generally, they:
+
+. They can include slash `/` for hierarchical (directory)
+ grouping, but no slash-separated component can begin with a
+ dot `.`.
+
+. They must contain at least one `/`. This enforces the presence of a
+ category like `heads/`, `tags/` etc. but the actual names are not
+ restricted.
+
+. They cannot have two consecutive dots `..` anywhere.
+
+. They cannot have ASCII control characters (i.e. bytes whose
+ values are lower than \040, or \177 `DEL`), space, tilde `~`,
+ caret `{caret}`, colon `:`, question-mark `?`, asterisk `*`,
+ or open bracket `[` anywhere.
+
+. They cannot end with a slash `/` nor a dot `.`.
+
+. They cannot end with the sequence `.lock`.
+
+. They cannot contain a sequence `@{`.
+
+. They cannot contain a `\\`.
+
+
+pkt-line Format
+---------------
+
+Much (but not all) of the payload is described around pkt-lines.
+
+A pkt-line is a variable length binary string. The first four bytes
+of the line, the pkt-len, indicates the total length of the line,
+in hexadecimal. The pkt-len includes the 4 bytes used to contain
+the length's hexadecimal representation.
+
+A pkt-line MAY contain binary data, so implementors MUST ensure
+pkt-line parsing/formatting routines are 8-bit clean.
+
+A non-binary line SHOULD BE terminated by an LF, which if present
+MUST be included in the total length.
+
+The maximum length of a pkt-line's data component is 65520 bytes.
+Implementations MUST NOT send pkt-line whose length exceeds 65524
+(65520 bytes of payload + 4 bytes of length data).
+
+Implementations SHOULD NOT send an empty pkt-line ("0004").
+
+A pkt-line with a length field of 0 ("0000"), called a flush-pkt,
+is a special case and MUST be handled differently than an empty
+pkt-line ("0004").
+
+----
+ pkt-line = data-pkt / flush-pkt
+
+ data-pkt = pkt-len pkt-payload
+ pkt-len = 4*(HEXDIG)
+ pkt-payload = (pkt-len - 4)*(OCTET)
+
+ flush-pkt = "0000"
+----
+
+Examples (as C-style strings):
+
+----
+ pkt-line actual value
+ ---------------------------------
+ "0006a\n" "a\n"
+ "0005a" "a"
+ "000bfoobar\n" "foobar\n"
+ "0004" ""
+----
--
1.6.5.2.340.g000a3e.dirty
^ permalink raw reply related
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