Signed-off-by: Alexander Kuleshov
---
Documentation/git-branch.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 311b336..722f865 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@
This patch adds support -d/--dry-run option for branch(es) deletion.
If -d/--dry-run option passed to git branch -d branch..., branch(es)
will not be removed, instead just print list of branches that are
to be removed.
For example:
$ git branch
a
b
c
* master
$ git branch
Under --whitespace=fix option, match_fragment() function examines
the preimage (the common context and the removed lines in the patch)
and the file being patched and checks if they match after correcting
all whitespace errors. When they are found to match, the common
context lines in the preimage
"Jason Pyeron" writes:
>> Is this complex pipeline the same as this (I didn't understand the
>> trailing I at the end)?
>
> Case insensitive, could have used [0-9a-fA-F].
Ahh, a GNU extension.
>> git cat-file commit "$newrev" |
>> sed -ne '/^gpgsig /,/^ -END/{
>> s
Hi,
looks good!
Phillip
> po/de.po | 39 +++
> 1 file changed, 15 insertions(+), 24 deletions(-)
>
>diff --git a/po/de.po b/po/de.po
>index 2fa5832..70ca3ff 100644
>--- a/po/de.po
>+++ b/po/de.po
>@@ -3129,9 +3129,8 @@ msgid "edit the description for the bran
Signed-off-by: Ramkumar Ramachandra
---
contrib/contacts/git-contacts | 4
contrib/contacts/git-contacts.txt | 16
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/contrib/contacts/git-contacts b/contrib/contacts/git-contacts
index dbe2abf..5dde920 100755
On Fri, Jan 16, 2015 at 3:58 PM, Ramkumar Ramachandra
wrote:
> Signed-off-by: Ramkumar Ramachandra
> ---
> diff --git a/contrib/contacts/git-contacts b/contrib/contacts/git-contacts
> index dbe2abf..b06f2e1 100755
> --- a/contrib/contacts/git-contacts
> +++ b/contrib/contacts/git-contacts
> @@ -8
Signed-off-by: Ramkumar Ramachandra
---
contrib/contacts/git-contacts | 4
1 file changed, 4 insertions(+)
diff --git a/contrib/contacts/git-contacts b/contrib/contacts/git-contacts
index dbe2abf..b06f2e1 100755
--- a/contrib/contacts/git-contacts
+++ b/contrib/contacts/git-contacts
@@ -8,1
Kyle J. McKay writes:
>>> "id -u" works for me in MSYS and cygwin (each appears to have it's
>>> own id.exe).
>>
>> That's comforting. MSYS was the one I was most worried about. What UID
>> do they report? I.e., do they correctly tell us if we are root (or
>> more accurately, if we are not root)?
On Fri, Jan 16, 2015 at 02:47:25PM -0500, Jason Pyeron wrote:
> > I am not sure if the design of this, to require signature only on
> > the tip commit, is sound. That is not a -bug- in the script,
> > though.
>
> It is to handle the "all my devs worked on this, they do
> GPG", so as long
> -Original Message-
> From: Junio C Hamano
> Sent: Friday, January 16, 2015 14:53
>
> Jonathan Nieder writes:
>
> >> would there be interest in accepting a patch for
> >>
> >> %Gs - the raw GPG text from the commit
> >> %Gf - the key fingerprint
> >
> > There may be bikeshedding on the
"Kyle J. McKay" writes:
> If I make this change on top of 250b3c6c:
>
> diff --git a/builtin/apply.c b/builtin/apply.c
> index df773c75..8795e830 100644
> --- a/builtin/apply.c
> +++ b/builtin/apply.c
> @@ -2390,6 +2390,8 @@ static int match_fragment(struct image *img,
> fixed_buf = strbuf_
Jonathan Nieder writes:
>> would there be interest in accepting a patch for
>>
>> %Gs - the raw GPG text from the commit
>> %Gf - the key fingerprint
>
> There may be bikeshedding on the exact format specifier, but aside
> from that I don't see why not. ;-)
I was about to say "As long as the ex
Eric Sunshine writes:
> On Fri, Jan 16, 2015 at 1:35 PM, Junio C Hamano wrote:
>> "Philip Oakley" writes:
>>
>>> die(_("--author '%s': not 'Name ', nor matches any existing
>>> author"));
>>
>> Sounds good. Thanks.
>
> To further bikeshed (particularly if "nor" is in the mix):
>
> neit
> -Original Message-
> From: Junio C Hamano
> Sent: Friday, January 16, 2015 14:33
>
> "Jason Pyeron" writes:
>
> > What would you change? Any bugs that you see?
>
> > sigkey=$(\
> > git cat-file $newrev -p |\
>
> "-p" being a command line option should come before revision, but
> mor
Junio C Hamano writes:
> I am not sure if you need these unsightly backslashes. When you
> stop talking to it after saying "$(", or "$( git cat-file ... |",
> the shell _knows_ that you haven't stopped what you want to tell
> it.
Ehh, s/stopped/finished/, that is.
--
To unsubscribe from this li
On Fri, Jan 16, 2015 at 1:35 PM, Junio C Hamano wrote:
> "Philip Oakley" writes:
>
>> die(_("--author '%s': not 'Name ', nor matches any existing
>> author"));
>
> Sounds good. Thanks.
To further bikeshed (particularly if "nor" is in the mix):
neither 'Name ' nor a match for an existin
"Jason Pyeron" writes:
> What would you change? Any bugs that you see?
> sigkey=$(\
> git cat-file $newrev -p |\
"-p" being a command line option should come before revision, but
more importantly, because you accept pushes only to refs/heads/, you
would want to explicitly require commit object
Hi,
Jason Pyeron wrote:
> COMMITID=ef8df950c8d16dace62e55d18b26617b1268f1bc; \
> git show $COMMITID --pretty=format:%GK -s
>
> do the same thing.
>
> Is there a way to properly extract the GPG signature object, such
> that GPG operations may be done on it?
>
> Are the git log formats safe to use
On Thu, Jan 15, 2015 at 3:53 PM, Jeff King wrote:
> On Thu, Jan 15, 2015 at 03:24:15PM -0800, Stefan Beller wrote:
>
>> I see the performance problem as well as the contention problem
>> you're pointing out. Dealing with loose refs however creates other
>> problems such as directory/file conflicts
Dev & users:
I would like your feedback.
I am working on a continuous integration (CI) system for CipherShed.org and we
want to allow any fork to submit their patch to our CI server farm which will
do integration testing. We want it to be easy to submit code, but to not allow
interference with
Junio C Hamano writes:
> I think we will later make SANITY to require NOT_ROOT and POSIXPERM,
> at which point many existing tests that require POSIXPERM,SANITY can
> be simplified to require only SANITY, but that will be a follow-up
> change to this fix.
And here is such a follow-up.
-- >8 --
On Thu, Jan 15, 2015 at 3:34 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> In ref_transaction_commit
>> * commit the .lock file to its destination
>> * in case this is a deletion:
>> * remove the loose ref
>> * and repack the packed refs file if ne
On Jan 16, 2015, at 01:16, Jeff King wrote:
Subject: [PATCH] t/lib-httpd: switch SANITY check for NOT_ROOT
[...]
We implement NOT_ROOT by checking `id -u`, which is in POSIX
and seems to be available even on MSYS. Note that we cannot
just call this "ROOT" and ask for "!ROOT". The possible
out
On Jan 15, 2015, at 19:34, Jeff King wrote:
On Thu, Jan 15, 2015 at 07:27:34PM -0800, Kyle J. McKay wrote:
"id -u" works for me in MSYS and cygwin (each appears to have it's
own
id.exe).
That's comforting. MSYS was the one I was most worried about. What UID
do they report? I.e., do they co
"Philip Oakley" writes:
> die(_("--author '%s': not 'Name ', nor matches any existing
> author"));
Sounds good. Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majo
Jeff King writes:
> So here's a re-roll with `id -u`, as that may be the simplest way to get
> people to test (with the patch applied, running t5550 as a normal user
> should work, and as root should skip the tests).
>
> -- >8 --
> Subject: [PATCH] t/lib-httpd: switch SANITY check for NOT_ROOT
>
From: "Junio C Hamano"
Jeff King writes:
On Thu, Jan 15, 2015 at 09:48:26AM -0800, Junio C Hamano wrote:
> Rename the error message to make it clearer that the failure has
> two
> reasons in this case:
> "Bad --author parameter '%s': neither completely wellformed nor
> part of
> an exist
Jeff King writes:
> On Thu, Jan 15, 2015 at 09:48:26AM -0800, Junio C Hamano wrote:
>
>> > Rename the error message to make it clearer that the failure has two
>> > reasons in this case:
>> > "Bad --author parameter '%s': neither completely wellformed nor part of
>> > an existing one"
>>
>> You
Similar to the issue mintywalker originally mentioned on Jan 8th 2015,
during a "git svn clone" I get a Bad File Descriptor error using:
git-svn version 2.2.2 (svn 1.8.8) on Ubuntu 14.04.
r460 = 456377de3906d689c56e51af842e18abe086a980 (refs/remotes/origin/trunk)
A client/binary/
I can't agree that
COMMITID=ef8df950c8d16dace62e55d18b26617b1268f1bc; \
git cat-file $COMMITID -p |\
sed -e '/^ /{H;$!d;}; x;/^gpgsig /!d; s/^gpgsig//;' |\
cut -c 2- |\
gpg --list-packets --textmode |\
sed '/keyid/!d; s/.*keyid \([0-9A-F]\{16\}\).*/\1/I'
is the way to go, when
COMMITID=ef
ion more concrete: I would expect 'git describe'
to output the tag where the number of commits that are in HEAD but not
in the tag is the lowest, and that would (always) be the bl-1 here.
=== /tmp/tmp-ws-20150116-11061-169bt1w
searching to describe HEAD
lightweight3 r2.4/bl-1
Hi all again,
today another expectation crumbled.
I expected the algo of 'git describe' to be deterministic,
but it happens to return different tags in structurally
identical repositories. These are generated on each run
of a test (and obviously have different dates and thus
commit IDs), and 'git
On Thu, Jan 15, 2015 at 09:48:26AM -0800, Junio C Hamano wrote:
> > Rename the error message to make it clearer that the failure has two
> > reasons in this case:
> > "Bad --author parameter '%s': neither completely wellformed nor part of
> > an existing one"
>
> You are trying to help a user who
On Thu, Jan 15, 2015 at 10:34:46PM -0500, Jeff King wrote:
> > "id -u" works for me in MSYS and cygwin (each appears to have it's own
> > id.exe).
>
> That's comforting. MSYS was the one I was most worried about. What UID
> do they report? I.e., do they correctly tell us if we are root (or
> more
The description of strbuf_split_buf says most of what
needs to be said for all of the split variants that take
strings, raw memory, etc. We have a boilerplate comment
above each that points to the first. This boilerplate
ends up making it harder to read, because it spaces out the
functions, which c
The relationship between these makes more sense if you read
them as a group, which can help people who are looking for
the right function. Let's give them a single comment.
Signed-off-by: Jeff King
---
strbuf.h | 12 ++--
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/str
The original API doc had something like:
Functions
-
* Life cycle
... some life-cycle functions ...
* Related to the contents of the buffer
... functions related to contents
etc
This grouping can be hard to read in the comment sources,
given the "
This is much easier to read when the whole thing is stuffed
inside a comment block. And there is precedent for this
convention in markdown (and just in general ascii text).
Signed-off-by: Jeff King
---
strbuf.h | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/strbu
From: Stefan Beller
The prior patch uses "/**" to denote "documentation"
comments that we pulled from api-strbuf.txt. Let's use a
consistent style for similar comments that were already in
strbuf.h.
Signed-off-by: Stefan Beller
Signed-off-by: Jeff King
---
This adds one spot that was missed in
Using a hanging indent is much more readable. This means we
won't format as asciidoc anymore, but since we don't have a
working system for extracting these comments anyway, it's
probably more important to just make the source readable.
Signed-off-by: Jeff King
---
strbuf.h | 74 +
Some of strbuf is documented as comments above functions,
and some is separate in Documentation/technical/api-strbuf.txt.
This makes it annoying to find the appropriate documentation.
We'd rather have it all in one place, which means all in the
text document, or all in the header.
Let's choose the
This is a re-roll of this series:
http://thread.gmane.org/gmane.comp.version-control.git/260922/focus=261374
from early December to move the strbuf documentation into the header
file. I've incorporated all of the minor formatting feedback and
suggestions from Jonathan and Stefan in response to
Junio C Hamano schrieb am 15.01.2015 um 21:11:
> Michael J Gruber writes:
>
>> git commit and git status in long format show the diff between HEAD
>> and the index when given -v. This allows previewing a commit to be made.
>>
>> They also list tracked files with unstaged changes, but without a di
44 matches
Mail list logo
