Felipe Contreras wrote:
> Yes, I see how xx/topic~4 would be useful in the instruction sheet, I
> just didn't see it would be useful to generate that from an existing
> integration branch. After the explanation above I see how it could be
> useful to some people (though not all). I'll implement tha
Junio C Hamano wrote:
> I presume that the workflow can be mimicked by having another branch
> 'match-next' and building it on top of 'master', and then building
> 'jch' on top of it, and then building 'pu' on top of it. Then you
> should be able to play 'match-next' instruction on top of 'next'
>
Add an option to format-patch for reading a signature from a file.
$ git format-patch -1 --signature-file=$HOME/.signature
The config variable `format.signaturefile` can also be used to make
this the default.
$ git config format.signaturefile $HOME/.signature
$ git format-patch -1
Signed
v9 of patch to add format-patch --signature-file option.
This revision includes more suggestions from Junio C Hamano.
- Reworded patch description. Using "special characters" is
not a feature of this patch.
- Changed patch description to follow gitcli(7) guidlines.
"--signature
From: Jeff King
When we print an email signature, we print the divider "--
\n", then the signature string, then two newlines.
Traditionally the signature is a one-liner (and the default
is just the git version), so the extra newline makes sense.
But one could easily specify a longer, multi-line
On Sat, May 24, 2014 at 12:33 AM, Pasha Bolokhov
wrote:
> When an explicit '--git-dir' option points to a directory inside
> the work tree, git treats it as if it were any other directory.
> In particular, 'git status' lists it as untracked, while 'git add -A'
> stages the metadata directory entir
Hello
Sorry for the delay, I hope that version is more acceptable.
I updated the test case as well, but did not manage to get the actual p4
tests to work here (I have p4 and p4d installed, they start but all the
other tests seems to fail). Still the change is straightforward.
Cheers,
Maxime Cos
The diff information render the spec file unusable as is by p4,
do not include it when run with --prepare-p4-only so that the
given file can be directly passed to p4.
With --prepare-p4-only, git-p4 already tells the user it can use
p4 submit with the generated spec file. This fails because of the
On Sat, May 24, 2014 at 4:40 AM, Junio C Hamano wrote:
> Duy, 9f673f94 (gc: config option for running --auto in background,
> 2014-02-08) turns to be not such a hot idea. Sure, if we kick it
> off background after doing something heavy, immediately before
> giving control back to the end-user, an
Junio C Hamano wrote:
> * fc/publish-vs-upstream (2014-04-21) 8 commits
> . sha1_name: add support for @{publish} marks
> . sha1_name: simplify track finding
> . sha1_name: cleanup interpret_branch_name()
> . branch: display publish branch
> . push: add --set-publish option
> . branch: add --
>> You won't notice anything different in the output of course, but the
>> environment will be odd:
>> GIT_DIR=../tmp/./././.git
>> GIT_WORK_TREE=$HOME/tmp
>> Notice how the work-tree has been normalized and git-dir hasn't. It's
>> kinda hard to imagine when this can lead to an error, but n
On Fri, May 23, 2014 at 5:22 PM, Junio C Hamano wrote:
> Jeff King writes:
>
>> On Fri, May 23, 2014 at 01:05:40PM -0700, Junio C Hamano wrote:
>>
>>> I just read read_graft_line(); it allows an empty line (both
>>> length-0 before the terminating LF or CRLF, and a line with
>>> isspace() only) a
Adam Borowski writes:
> On Fri, May 23, 2014 at 02:40:41PM -0700, Junio C Hamano wrote:
>> Adam Borowski writes:
>> > It looks like the periodic auto-repack backgrounds itself when it shouldn't
>> > do so. This causes the command it has triggered as a part of to fail:
>>
>> Duy, 9f673f94 (gc:
Hi,
>
>> /* "--git-dir" has been given */
>
> ... or it could have come from GIT_DIR environment, no?
Yes, it does not matter where it came from, but I'll correct the comment
>
> Does this "additional exclude" need to kick in if GIT_DIR is set to
> "/home/pasha/w/.git"? That is, w
On Fri, May 23, 2014 at 02:40:41PM -0700, Junio C Hamano wrote:
> Adam Borowski writes:
> > It looks like the periodic auto-repack backgrounds itself when it shouldn't
> > do so. This causes the command it has triggered as a part of to fail:
>
> Duy, 9f673f94 (gc: config option for running --aut
On May 23, 2014, at 13:05, Jeff King wrote:
On Thu, May 22, 2014 at 03:52:08PM -0700, Kyle J. McKay wrote:
Christian brought this up elsewhere, and I agree it's probably
better to
work over the whole buffer, NULs included. I'm happy to re-roll
(or you
can just pick up the version of the pat
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
The tip of the 'master' branch has past v2.0.0-rc4 (which was
unplanned, but there were last minute regressions to be taken care
of). Hopefully
On May 23, 2014, at 13:12, Jeff King wrote:
On Thu, May 22, 2014 at 03:52:21PM -0700, Kyle J. McKay wrote:
+static void extract_content_type(struct strbuf *raw, struct
strbuf *type)
+{
+ const char *p;
+
+ strbuf_reset(type);
+ strbuf_grow(type, raw->len);
+ for (p = r
Jonathan Nieder writes:
> - /^\s*export\s+[^=]*=/ and err '"export FOO=bar" is not por...
> + /\bexport\s+[A-Za-z0-9_]*=/ and err '"export FOO=bar" is n...
I see you also tightened what the "variable" to be assigned should
look like, which is a good change to avoid false positives.
Beca
On 05/23/2014 05:53 PM, Jonathan Nieder wrote:
> Hi,
>
> Michael Haggerty wrote:
>
>> The status quo is that we have a single reference back end consisting of
>> loose references sitting on top of packed references.
>>
>> But really, loose references and packed references are two relatively
>> in
Adam Borowski writes:
> Hi guys!
>
> It looks like the periodic auto-repack backgrounds itself when it shouldn't
> do so. This causes the command it has triggered as a part of to fail:
Yikes. In the meantime, I think you can turn gc.autodetach off as a
workaround, e.g.
$ git config --glob
Torsten Bögershausen writes:
> I wonder if we could keep the anchoring (to reduce false positives)
> and try to catch a line "command1 && command2" at the same time:
Well, "command1 || command2" would be the next thing you want to
catch, and I think you are at the entrance of a slipperly slope a
Jeff King writes:
> On Fri, May 23, 2014 at 01:05:40PM -0700, Junio C Hamano wrote:
>
>> I just read read_graft_line(); it allows an empty line (both
>> length-0 before the terminating LF or CRLF, and a line with
>> isspace() only) and ignore them, so "grep '^[^#]'" is not
>> sufficient.
>
> Than
This patch allows people to set `commit.verbose` to implicitly send `--verbose`
to `git commit`. It also introduces `--no-verbose` to override the configuration
setting.
Caleb Thompson
From aa2a5d48e6cd53082613f53990bc9d0fa60809f4 Mon Sep 17 00:00:00 2001
From: Caleb Thompson
Date: Fri, 23 May 2
On 05/23/2014 06:14 PM, Ronnie Sahlberg wrote:
> On Fri, May 23, 2014 at 6:49 AM, Michael Haggerty
> wrote:
>> [...]
>> When I combine these two lines of thought, it suggests to me that we
>> could do a better job of supporting *both* use cases. What if the
>> transaction object contained not an
Pasha Bolokhov writes:
> diff --git a/dir.c b/dir.c
> index 98bb50f..76969a7 100644
> --- a/dir.c
> +++ b/dir.c
> @@ -1588,6 +1588,26 @@ void setup_standard_excludes(struct dir_struct *dir)
> {
> const char *path;
> char *xdg_path;
> + const char *gitdir = get_git_dir();
> +
> +
On 2014-05-23 20.44, Jonathan Nieder wrote:
> Junio C Hamano wrote:
>> Elia Pinto writes:
>
>>> Found by check-non-portable-shell.pl
>>
>> Thanks.
>>
>> Makes me wonder why these two were missed, though.
>
> Good catch. check-non-portable-shell.pl uses an anchored regex:
>
> /^\s*export\
On Fri, May 23, 2014 at 6:15 AM, Elia Pinto wrote:
> Subject: Get rid of the non portable shell export VAR=VALUE costruct
s/costruct/construct/
s/non portable/non-portable/
> Found by check-non-portable-shell.pl
>
> Signed-off-by: Elia Pinto
> ---
> This is the second version of the patch that
On Fri, May 23, 2014 at 01:05:40PM -0700, Junio C Hamano wrote:
> I just read read_graft_line(); it allows an empty line (both
> length-0 before the terminating LF or CRLF, and a line with
> isspace() only) and ignore them, so "grep '^[^#]'" is not
> sufficient.
Thanks, I missed the space trimmin
On Fri, May 23, 2014 at 07:05:43PM +0200, Matthieu Moy wrote:
> FYI, as each years, I'm offering some of my students to contribute to
> free software, including Git. This year, no one chose Git.
>
> Anyway, thanks to those who provided some project ideas, and ... already
> looking forward to next
On Fri, May 23, 2014 at 04:43:38PM +0200, Karsten Blees wrote:
> Alright then. I've queued vor v5:
> * add __FILE__ __LINE__ for all trace output, if the compiler supports
> variadic macros
> * add timestamp for all trace output
> * perhaps move trace declarations to new trace.h
> * improve commi
Hi guys!
It looks like the periodic auto-repack backgrounds itself when it shouldn't
do so. This causes the command it has triggered as a part of to fail:
==
[~/linux](master)$ git pull --rebase
remote: Counting objects: 455
On Thu, May 22, 2014 at 03:52:21PM -0700, Kyle J. McKay wrote:
> >+static void extract_content_type(struct strbuf *raw, struct strbuf *type)
> >+{
> >+const char *p;
> >+
> >+strbuf_reset(type);
> >+strbuf_grow(type, raw->len);
> >+for (p = raw->buf; *p; p++) {
> >+if (
Jeff King writes:
> On Thu, May 22, 2014 at 11:33:04PM +0200, Christian Couder wrote:
>
>> The usage string for this option is:
>>
>> git replace [-f] --graft [...]
>>
>> First we create a new commit that is the same as
>> except that its parents are [...]
>>
>> Then we create a replace ref
On Thu, May 22, 2014 at 03:52:08PM -0700, Kyle J. McKay wrote:
> >Christian brought this up elsewhere, and I agree it's probably better to
> >work over the whole buffer, NULs included. I'm happy to re-roll (or you
> >can just pick up the version of the patch in this thread),
>
> The only reason I
On Thu, May 22, 2014 at 02:04:20PM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> >> > Yes, and that would be fine with me (I actually wrote strbuf_tolower for
> >> > my own use, and _then_ realized that we already had such a thing that
> >> > could be replaced).
> >> ...
> > ... I think
>
On Thu, May 22, 2014 at 11:33:04PM +0200, Christian Couder wrote:
> The usage string for this option is:
>
> git replace [-f] --graft [...]
>
> First we create a new commit that is the same as
> except that its parents are [...]
>
> Then we create a replace ref that replace with
> the commit
On Fri, May 23, 2014 at 10:11:03AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > One thing that this misses (as does your original script) is the
> > reflogs. Doing "branch -m" to rename a branch will actually move the
> > reflogs, too, but there is otherwise no way to access that
> > f
Christian Couder writes:
> The usage string for this option is:
>
> git replace [-f] --graft [...]
>
> First we create a new commit that is the same as
> except that its parents are [...]
>
> Then we create a replace ref that replace with
> the commit we just created.
Shucks. An older versio
Junio C Hamano writes:
>> -if (delete_ref(refname, sha1, 0))
>> +if (delete_ref(refname, NULL, 0))
>> result |= error(_("Could not remove branch %s"),
>> refname);
By the way, how does this series interact with what Ronnie and Michael
are working on
Pasha Bolokhov writes:
> 1) an apparent missing "normalize_path(git_dir)", when GIT_DIR is an
> absolute path:
>
> don't even need to name the repository anything different, but run this
> command:
>
> $ cd ~/tmp/
> $ git init
> $ git --git-dir=$HOME/tmp/../tmp/./././.git --work-tree=$HOME/tmp/.
Jens Lindström writes:
> When 'git remote rm' or 'git remote prune' were used in a repository
> with many refs, and needed to delete many remote-tracking refs, a lot
> of time was spent deleting those refs since for each deleted ref,
> repack_without_refs() was called to rewrite packed-refs witho
Jens Lindström writes:
> When removing a remote, delete the remote-tracking branches before
> deleting the remote configuration. This way, if the operation fails or
> is aborted while deleting the remote-tracking branches, the command can
> be rerun to complete the operation.
>
> Signed-off-by:
Hi,
Junio C Hamano wrote:
> Junio C Hamano writes:
>> Makes me wonder why these two were missed, though.
>
> Perhaps something like this?
[...]
> - /^\s*export\s+[^=]*=/ and err '"export FOO=bar" is not portable (please
> use FOO=bar && export FOO)';
> + /(?:^|[^-a-zA-Z0-9_])export\s+[^
Junio C Hamano wrote:
> Elia Pinto writes:
>> Found by check-non-portable-shell.pl
>
> Thanks.
>
> Makes me wonder why these two were missed, though.
Good catch. check-non-portable-shell.pl uses an anchored regex:
/^\s*export\s+[^=]*=/
Perhaps something like
/\bexport\s+[A-Za
Hi,
Since at it, I have discovered a couple more minor things with
this rarely-used option. I'm however a bit wary of stepping on
somebody's nerve with this sort of picking things.. :)
Nevertheless,
1) an apparent missing "normalize_path(git_dir)", when GIT_DIR is an
abso
Junio C Hamano writes:
> Elia Pinto writes:
>
>> Found by check-non-portable-shell.pl
>
> Thanks.
>
> Makes me wonder why these two were missed, though.
Perhaps something like this?
I didn't check other rules, though, because I still have a feeling
that this "pretend to understand the shell sy
Jakub Narębski writes:
> W dniu 2014-05-22 23:33, Christian Couder pisze:
>
>> +--graft [...]::
>> +Create a graft commit. A new commit is created with the same
>> +content as except that its parents will be
>> +[...] instead of 's parents. A replacement ref
>> +is then created
Ronnie Sahlberg wrote:
> On Thu, May 22, 2014 at 4:53 PM, Jonathan Nieder wrote:
>> ... or is the problem that the reflogs conflict?
>>
>> How does rename_ref handle propagating the reflog from the old
>> name to the new name, by the way?
>
> I haven't touched that yet, but we can fix it after th
Elia Pinto writes:
> Found by check-non-portable-shell.pl
Thanks.
Makes me wonder why these two were missed, though.
t/t3032-merge-recursive-options.sh | 6 +-
t/t5560-http-backend-noserver.sh | 6 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/t/t3032-merge-rec
Good day,
We are Christian Organization, That give out loan at a low rate, Contact us for
more information christian.loanorganizat...@yahoo.cl
Regard,
Christian Organization.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
M
When an explicit '--git-dir' option points to a directory inside
the work tree, git treats it as if it were any other directory.
In particular, 'git status' lists it as untracked, while 'git add -A'
stages the metadata directory entirely
Add GIT_DIR to the list of excludes in setup_standard_exclud
On Fri, May 23, 2014 at 10:10:05AM -0700, Junio C Hamano wrote:
> John Keeping writes:
>
> > On Fri, May 23, 2014 at 02:11:55PM +0400, Sergei Organov wrote:
> >> Hello,
> >>
> >> After convertion of a project from CVS to git, I'd like to rename some
> >> references in the created git repository
Jeff King writes:
> One thing that this misses (as does your original script) is the
> reflogs. Doing "branch -m" to rename a branch will actually move the
> reflogs, too, but there is otherwise no way to access that
> functionality.
>
> It does not seem unreasonable to teach "git update-ref" to
John Keeping writes:
> On Fri, May 23, 2014 at 02:11:55PM +0400, Sergei Organov wrote:
>> Hello,
>>
>> After convertion of a project from CVS to git, I'd like to rename some
>> references in the created git repository (before it's published, so no
>> problems here). Is there a plumbing that woul
Jens Lindström writes:
> Removing the remote configuration (I assume you mean the
> "remote." section from .git/config) last in 'remote rm' would be
> a bit better I think. Especially ...
Yes, that is exactly why I suggested it ;-)
> Doing the repacking first and then run through and delete lo
W dniu 2014-05-22 23:33, Christian Couder pisze:
+--graft [...]::
+ Create a graft commit. A new commit is created with the same
+ content as except that its parents will be
+ [...] instead of 's parents. A replacement ref
+ is then created to replace with the newly cr
Hi,
FYI, as each years, I'm offering some of my students to contribute to
free software, including Git. This year, no one chose Git.
Anyway, thanks to those who provided some project ideas, and ... already
looking forward to next year ;-).
Cheers,
--
Matthieu Moy
http://www-verimag.imag.fr/~mo
Christian Couder writes:
> Here is a small patch series to implement:
>
> git replace [-f] --graft [...]
>
> The changes since the RFC/PATCH are the following:
>
> - in patch 1/3, parse_commit_buffer() is now used to
> make sure is not corrupt
> - patch 2/3 add some tests
> - patch 3/3
Jeremiah Mahler writes:
> Your comments make it clear that I have not accounted for all the possible
> cases. Below is a table of all the reasonable cases. It should account
> for cases you mentioned as well as others.
>
> Key:
> ---
> default: Git version number
> sig1: .signature from
I have made a couple of commits. Then:
git svn rebase
For each of my modified files it says they need to be updated. This is
probably wrong, but I decided it meant that I should commit. So:
git add ...
git commit ...
git svn dcommit
The dcommit reports error 1. I see that subversion was not
Elia Pinto wrote:
> Signed-off-by: Elia Pinto
> ---
> contrib/subtree/t/t7900-subtree.sh |3 ++-
> git-remote-testgit.sh |3 ++-
> git-stash.sh |3 ++-
> 3 files changed, 6 insertions(+), 3 deletions(-)
Reviewed-by: Jonathan Nieder
--
To unsubscri
This patch makes the code more readable for setting
the refspec variable
Signed-off-by: Elia Pinto
---
git-remote-testgit.sh | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/git-remote-testgit.sh b/git-remote-testgit.sh
index 1c006a0..fb8a003 100755
--- a/git-
On Fri, May 23, 2014 at 6:49 AM, Michael Haggerty wrote:
> On 05/19/2014 09:02 PM, Ronnie Sahlberg wrote:
>> On Sat, May 17, 2014 at 8:35 AM, Michael Haggerty
>> wrote:
>>> On 05/16/2014 07:37 PM, Ronnie Sahlberg wrote:
Wrap all the ref updates inside a transaction to make the update atomic
Hi,
Michael Haggerty wrote:
> The status quo is that we have a single reference back end consisting of
> loose references sitting on top of packed references.
>
> But really, loose references and packed references are two relatively
> independent reference back ends [1]. We just happen to use th
On 05/15/2014 07:29 PM, Ronnie Sahlberg wrote:
> Add a new flag REF_ISPACKONLY that we can use in ref_transaction_delete.
> This flag indicates that the ref does not exist as a loose ref andf only as
> a packed ref. If this is the case we then change the commit code so that
> we skip taking out a l
On Thu, May 22, 2014 at 4:53 PM, Jonathan Nieder wrote:
> Jonathan Nieder wrote:
>> Ronnie Sahlberg wrote:
>
>>> I hate rename_ref :-)
>>>
>>> I have reworked the transaction code to special case the deletion of
>>> the old ref for n/n -> n and n -> n/n renames
>>> so that we can carefully avoid
Am 22.05.2014 11:59, schrieb Jeff King:
> On Thu, May 22, 2014 at 02:40:48AM +0200, Karsten Blees wrote:
>
>> E.g. if I'm interested in a particular code section, I throw in 2
>> lines of code (before and after the code section). This gives very
>> accurate results, without significantly affecting
On 05/19/2014 09:02 PM, Ronnie Sahlberg wrote:
> On Sat, May 17, 2014 at 8:35 AM, Michael Haggerty
> wrote:
>> On 05/16/2014 07:37 PM, Ronnie Sahlberg wrote:
>>> Wrap all the ref updates inside a transaction to make the update atomic.
>>>
>>> Signed-off-by: Ronnie Sahlberg
>>> ---
>>> builtin/r
On Fri, May 23, 2014 at 03:35:54PM +0400, Sergei Organov wrote:
> John Keeping writes:
> > On Fri, May 23, 2014 at 02:11:55PM +0400, Sergei Organov wrote:
> >> Hello,
> >>
> >> After convertion of a project from CVS to git, I'd like to rename some
> >> references in the created git repository (b
John Keeping writes:
> On Fri, May 23, 2014 at 02:11:55PM +0400, Sergei Organov wrote:
>> Hello,
>>
>> After convertion of a project from CVS to git, I'd like to rename some
>> references in the created git repository (before it's published, so no
>> problems here). Is there a plumbing that would
On Fri, May 23, 2014 at 02:11:55PM +0400, Sergei Organov wrote:
> Hello,
>
> After convertion of a project from CVS to git, I'd like to rename some
> references in the created git repository (before it's published, so no
> problems here). Is there a plumbing that would do:
>
> git rename-ref
>
When 'git remote prune' was used to delete many refs in a repository
with many refs, a lot of time was spent checking for (now) dangling
symbolic refs pointing to the deleted ref, since warn_dangling_symref()
was once per deleted ref to check all other refs in the repository.
Avoid this using the
When 'git remote rm' or 'git remote prune' were used in a repository
with many refs, and needed to delete many remote-tracking refs, a lot
of time was spent deleting those refs since for each deleted ref,
repack_without_refs() was called to rewrite packed-refs without just
that deleted ref.
To avo
When removing a remote, delete the remote-tracking branches before
deleting the remote configuration. This way, if the operation fails or
is aborted while deleting the remote-tracking branches, the command can
be rerun to complete the operation.
Signed-off-by: Jens Lindström
---
builtin/remote.
Changes since previous version:
* Additionally change the order that 'remote rm' does things so that it
removes the remote configuration as the last step and only if the
other steps succeeded.
* Change the packed-refs repacking patch to repack before deleting refs
instead of after. Th
Found by check-non-portable-shell.pl
Signed-off-by: Elia Pinto
---
This is the second version of the patch that includes
Junio suggestions.
contrib/subtree/t/t7900-subtree.sh |3 ++-
git-remote-testgit.sh |3 ++-
git-stash.sh |3 ++-
3 files chang
Hi Thomas,
On Wed, May 21, 2014 at 10:33 PM, Thomas Ferris Nicolaisen
wrote:
> This is normal. Every time you update or sync against the SVN server,
> your local history is rewritten if you have local commits: All your
> local commits are rebased on top of the latest changes coming from
> SVN.
>
Hello,
After convertion of a project from CVS to git, I'd like to rename some
references in the created git repository (before it's published, so no
problems here). Is there a plumbing that would do:
git rename-ref
for me?
For reference, the (ugly) solution I currrently use is:
# Renamve bra
On Tue, May 20, 2014 at 10:29 PM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> A bit safer way to organize might be to first create a list of the
>> refs to be removed in-core, update packed-refs without these refs to
>> be removed, and then finally remove the loose ones, but I haven't
>>
80 matches
Mail list logo
