The documentation for the rev^{type} syntax (e.g., v1.8.4^{tree})
needed some fixing, and the fixes motivated some other documentation
cleanups.
Changes since v1 (2013-06-18, see
http://thread.gmane.org/gmane.comp.version-control.git/228325):
* standardize on 'treeish' (don't use 'tree-ish')
Replace all instances of 'tree-ish' with 'treeish':
* to standardize on a single spelling (the documentation contained a
mix of 'treeish' and 'tree-ish')
* to be consistent with variable names (hyphens are not usually
allowed in variable names)
* to be consistent with 'committish'
If possible, rev will be dereferenced even if it is not a tag type
(e.g., commit dereferenced to a tree).
Signed-off-by: Richard Hansen rhan...@bbn.com
---
Documentation/revisions.txt | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/Documentation/revisions.txt
Am 8/31/2013 21:27, schrieb Felipe Contreras:
On Fri, Aug 30, 2013 at 2:56 AM, Johannes Sixt j.s...@viscovery.net wrote:
Am 8/30/2013 8:32, schrieb Junio C Hamano:
If you have a history where
- branches master and maint point at commit A;
- branch next points at commit B that is a
Am 8/31/2013 23:26, schrieb Felipe Contreras:
+--except::
+ Skip the following object names. For example:
+ '--branches --except master' will show all the branches, except master.
+ This differs from --not in that --except will still show the object, if
+ they are referenced
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t6101-rev-parse-parents.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t6101-rev-parse-parents.sh b/t/t6101-rev-parse-parents.sh
index bead4d7..c10580c 100755
--- a/t/t6101-rev-parse-parents.sh
+++
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t6101-rev-parse-parents.sh | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/t/t6101-rev-parse-parents.sh b/t/t6101-rev-parse-parents.sh
index b9aef31..0653f5e 100755
---
Just as 5 == X is weird, so is comparing first the expected value, and
then the value we are testing. So switch them around.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t6101-rev-parse-parents.sh | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
Pretty much all the tests follow a different style.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t6101-rev-parse-parents.sh | 74 ++--
1 file changed, 58 insertions(+), 16 deletions(-)
diff --git a/t/t6101-rev-parse-parents.sh
Typing 'HEAD' is tedious, especially when we can use '@' instead.
The reason for choosing '@' is that it follows naturally from the
ref@op syntax (e.g. HEAD@{u}), except we have no ref, and no
operation, and when we don't have those, it makes sens to assume
'HEAD'.
So now we can use 'git show
Felipe Contreras (2):
sha1-name: pass len argument to interpret_branch_name()
Add new @ shortcut for HEAD
Documentation/git-check-ref-format.txt | 2 ++
Documentation/revisions.txt| 3 +++
cache.h| 2 +-
refs.c |
This is useful to make sure we don't step outside the boundaries of what
we are interpreting at the moment. For example while interpreting
foobar@{u}~1, the job of interpret_branch_name() ends right before ~1,
but there's no way to figure that out inside the function, unless the
len argument is
Am 9/1/2013 4:08, schrieb Nguyễn Thái Ngọc Duy:
git-add--interactive.perl rejects arguments with colons in 21e9757
(Hack git-add--interactive to make it work with ActiveState Perl -
2007-08-01). Pathspec magic starts with a colon, so it won't work if
these pathspecs are passed to
On Mon, Sep 2, 2013 at 1:25 AM, Johannes Sixt j.s...@viscovery.net wrote:
Am 8/31/2013 21:27, schrieb Felipe Contreras:
On Fri, Aug 30, 2013 at 2:56 AM, Johannes Sixt j.s...@viscovery.net wrote:
Am 8/30/2013 8:32, schrieb Junio C Hamano:
If you have a history where
- branches master and
On Mon, Sep 2, 2013 at 1:30 AM, Johannes Sixt j.s...@viscovery.net wrote:
It would be better to settle on the meaning of --except before throwing
back and forth implementations.
I've lost the count of features that get discussed endlessly, and
nobody implements them ever. The implementation
Instead of parsing left to right, do it right do left, this way it is
much more natural and probably efficient too, as there's less
recursivity.
In theory there shouldn't be any functional changes, although there's at
least one error message that has changed.
Signed-off-by: Felipe Contreras
Signed-off-by: Matthieu Moy matthieu@imag.fr
---
contrib/mw-to-git/git-remote-mediawiki.perl | 3 +++
1 file changed, 3 insertions(+)
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl
b/contrib/mw-to-git/git-remote-mediawiki.perl
index f8d7d2c..22300a1 100755
---
We used to update the private ref ourselves, but this update is now done
by default (since 664059fb62).
Signed-off-by: Matthieu Moy matthieu@imag.fr
---
contrib/mw-to-git/git-remote-mediawiki.perl | 1 -
1 file changed, 1 deletion(-)
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl
There are a few level 4 and 2 perlcritic issues in the current code. We
make level 5 fatal, and keep level 2 as warnings.
Signed-off-by: Matthieu Moy matthieu@imag.fr
---
contrib/mw-to-git/Makefile | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git
Since 664059fb62 (Felipe Contreras, Apr 17 2013, transport-helper: update
remote helper namespace), a 'push' operation on a remote helper updates
the private ref by default. This is often a good thing, but it can also
be desirable to disable this update to force the next 'pull' to re-import
the
Felipe Contreras felipe.contre...@gmail.com writes:
Hi,
As it has been discussed before, our support for triangular workflows is
lacking, and the following patch series aims to improve that situation.
I may be stating the obvious, but isn't your series a duplicate of
remote.pushDefault,
On Mon, Sep 2, 2013 at 2:25 AM, Matthieu Moy
matthieu@grenoble-inp.fr wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
As it has been discussed before, our support for triangular workflows is
lacking, and the following patch series aims to improve that situation.
I may be
I'm facing the same issue. I'm using git-1.8.4 and subversion 1.8.3 on
Ubuntu.
I'm proposing a different modification to Ra.pm:
Jonathan's modifications basically disable the use of $RA. The modifications
above ensure that the destructor of $RA is called before doing an
apr_terminate().
Best
Since 664059fb62 (Felipe Contreras, Apr 17 2013, transport-helper: update
remote helper namespace), a 'push' operation on a remote helper updates
the private ref by default. This is often a good thing, but it can also
be desirable to disable this update to force the next 'pull' to re-import
the
On Mon, Sep 02, 2013 at 08:42:18AM +0200, Johannes Sixt wrote:
Am 9/1/2013 4:08, schrieb Nguyễn Thái Ngọc Duy:
git-add--interactive.perl rejects arguments with colons in 21e9757
(Hack git-add--interactive to make it work with ActiveState Perl -
2007-08-01). Pathspec magic starts with a
Am 9/2/2013 11:30, schrieb Duy Nguyen:
On Mon, Sep 02, 2013 at 08:42:18AM +0200, Johannes Sixt wrote:
Am 9/1/2013 4:08, schrieb Nguyễn Thái Ngọc Duy:
git-add--interactive.perl rejects arguments with colons in 21e9757
(Hack git-add--interactive to make it work with ActiveState Perl -
On Mon, Sep 2, 2013 at 5:41 PM, Johannes Sixt j.s...@viscovery.net wrote:
Which features do we lose on Windows with the previous patch and this fixup?
New pathspec magic :(glob), :(literal) and :(icase). You can still use
them via --*-pathspecs or equivalent env variables. You just can't
enable
Every git svn call that involves a fetch produces a segmentation fault on
exit (but the operation succeeds).
From what I see, this looks quite similiar to the 'serf' issue I've recently
reported to the serf-dev mailing list [1]. It should be fixed by now, so,
the latest serf@trunk build should
Am 02.09.2013 13:57, schrieb Evgeny Kotkov:
Every git svn call that involves a fetch produces a segmentation fault on
exit (but the operation succeeds).
From what I see, this looks quite similiar to the 'serf' issue I've recently
reported to the serf-dev mailing list [1]. It should be fixed
On Sun, Sep 01, 2013 at 12:48:23AM -0400, Eric Sunshine wrote:
On Fri, Aug 30, 2013 at 9:35 AM, Nazri Ramliy ayieh...@gmail.com wrote:
With this new option, the above can be done with less keystrokes:
Grammar: s/less/fewer/
More below...
Thanks for taking the time to review this patch! The
On 09/01/2013 02:08 AM, Junio C Hamano wrote:
Brad King brad.k...@kitware.com writes:
static struct ref_lock *lock;
Not the fault of this patch, as the original update_ref() had it
this way, but it is not necessary to keep the value of this variable
across invocations. Let's drop
On 08/31/2013 12:30 PM, Michael Haggerty wrote:
Given that ret is only returned, you could restore the filename before
the if statement and replace the ret variable with an immediate return
statement:
Good idea. Fixed in next revision.
Thanks,
-Brad
--
To unsubscribe from this list: send the
On 08/31/2013 02:19 PM, Michael Haggerty wrote:
s/themeselves/themselves/
Fixed.
+struct ref_update *u1 = (struct ref_update *)(r1);
+struct ref_update *u2 = (struct ref_update *)(r2);
If you declare u1 and u2 to be const struct ref_update * (i.e., add
const), then you have const
On 09/01/2013 02:08 AM, Junio C Hamano wrote:
Though the refs themeselves cannot be modified together in a single
themselves.
Fixed.
I notice that we are using an array of structures and letting qsort
swap 50~64 bytes of data
Michael suggested this too, so fixed.
Optionally we could
On 08/31/2013 02:42 PM, Michael Haggerty wrote:
On 08/30/2013 08:12 PM, Brad King wrote:
+If all refs can be locked with matching oldvalues
+simultaneously all modifications are performed. Otherwise, no
Comma after simultaneously.
Fixed.
I agree with Junio that your quoting rules are
On 08/30/2013 06:51 PM, Junio C Hamano wrote:
Brad King brad.k...@kitware.com writes:
+With `--stdin`, update-ref reads instructions from standard input and
+performs all modifications together. Empty lines are ignored.
+Each non-empty line is parsed as whitespace-separated arguments.
+Use
On 08/31/2013 11:41 PM, Eric Sunshine wrote:
+ rm -f stdin
+ touch stdin
Unless the timestamp of 'stdin' has particular significance, modern
git tests avoid 'touch' in favor of creating the empty file like this
stdin
Fixed.
+ git update-ref --stdin stdin
The function resets refs rather than doing arbitrary updates.
Rename it to allow a future general-purpose update_refs function
to be added.
Signed-off-by: Brad King brad.k...@kitware.com
---
builtin/reset.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
Extend t/t1400-update-ref.sh to cover cases using the --stdin option.
Signed-off-by: Brad King brad.k...@kitware.com
---
t/t1400-update-ref.sh | 256 +
1 file changed, 256 insertions(+)
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
Factor loose ref deletion into helper function delete_ref_loose to allow
later use elsewhere.
Signed-off-by: Brad King brad.k...@kitware.com
---
refs.c | 27 +--
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/refs.c b/refs.c
index 4347826..ab9d22e
Generalize repack_without_ref as repack_without_refs to support a list
of refs and implement the former in terms of the latter.
Signed-off-by: Brad King brad.k...@kitware.com
---
refs.c | 29 ++---
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/refs.c
Add 'struct ref_update' to encode the information needed to update or
delete a ref (name, new sha1, optional old sha1, no-deref flag). Add
function 'update_refs' accepting an array of updates to perform. First
sort the input array to order locks consistently everywhere and reject
multiple
Hi Folks,
Here is the third revision of a series to support locking multiple
refs at the same time to update all of them consistently. The
previous revisions of the series can be found at $gmane/233260 and
$gmane/233458.
Updates since the previous revision of the series:
* Incorporated style
Add a --stdin signature to read update instructions from standard input
and apply multiple ref updates together. Use an input format that
supports any update that could be specified via the command-line,
including object names like branch:path with space.
Signed-off-by: Brad King
Expose lock_ref_sha1_basic's type_p argument to callers of
lock_any_ref_for_update. Update all call sites to ignore it by passing
NULL for now.
Signed-off-by: Brad King brad.k...@kitware.com
---
branch.c |2 +-
builtin/commit.c |2 +-
builtin/fetch.c|3
Factor the lock and write steps and error handling into helper functions
update_ref_lock and update_ref_write to allow later use elsewhere.
Expose lock_any_ref_for_update's type_p to update_ref_lock callers.
While at it, drop static from the local lock variable as it is not
necessary to keep
On 09/02/2013 01:48 PM, Brad King wrote:
+ /* Parse the argument: */
+ strbuf_reset(arg);
+ if (*next == '') {
+ if (unquote_c_style(arg, next, next))
+ die(badly quoted argument: %s, next);
+ return next;
+ }
+ while (*next
Dear Colleagues,
You are invited to upload your papers to our upcoming conferences
Paris, France, October 29-31, 2013. More details: http://www.wseas.org
Scientific Sponsors:
a) University of Zagreb, Croatia,
b) Music Academy Studio Musica, Italy,
c) Constanta Maritime University, Romania,
I guess you could try changing the OOM score for git-fast-import.
change /proc/pid/oomadj.
I think a value of -31 would make it very unlikely to be killed.
On 29/08/13 23:46, Pete Wyckoff wrote:
cmt...@gmail.com wrote on Wed, 28 Aug 2013 11:41 -0400:
On Mon, Aug 26, 2013 at 09:47:56AM -0400,
Am 31.08.2013 01:55, schrieb Junio C Hamano:
People often find git log --branches etc. that includes _all_
branches is cumbersome to use when they want to grab most but except
some. The same applies to --tags, --all and --glob.
Teach the revision machinery to remember patterns, and then
Sorry... I misread the README... it does indeed say /usr/local/git, which is
where the new binary was installed correctly. Eyes have been crossed by all of
these software re-installations and terminal commands. :P
Thanks.
~Ted
On 2013-09-02, at 1:16 PM, Ted Wood coolfac...@mac.com wrote:
On Tue, Aug 27, 2013 at 11:25 AM, Nicolas Pitre n...@fluxnic.net wrote:
This goes as follows:
- Tree reference: either variable length encoding of the index
into the SHA1 table or the literal SHA1 prefixed by 0 (see
add_sha1_ref()).
- Parent count: variable length encoding of the number
I've recently re-installed all of my MacPorts installations due to a
third-party application corrupting my installation. Upon attempting to install
git-core via MacPorts, it hangs on the Building stage, with no disk activity
(clang process is active in Terminal). So, I attempted to download
I have updated the original version of this patch to encompass the
feedback comments obtained. Updates include:
1) Rename option to --no-index for consistency with other commands
2) Improved Documentation text
3) Extension to test scripts to include this option
Regarding test scripts I have
From: Christian Couder chrisc...@tuxfamily.org
From: Philip Oakley philipoak...@iee.org
From: Christian Couder chrisc...@tuxfamily.org
Maybe we can show that in an example. But I think the patch is quite
clear as it is and should be enough.
If we really want to correct some false beliefs,
Hi,
Philip Oakley wrote:
Does `hash-object` do the inverese of `cat-file commit`?
I didn't find the hash-object(1) man page very informative on that matter
Hm. The manpage says:
Computes the object ID value for an object with specified type
with the contents of the named
From: Jonathan Nieder jrnie...@gmail.com
Hi,
Philip Oakley wrote:
Does `hash-object` do the inverese of `cat-file commit`?
I didn't find the hash-object(1) man page very informative on that
matter
Hm. The manpage says:
Computes the object ID value for an object with specified type
with
On Mon, Sep 2, 2013 at 5:20 PM, Dave Williams
d...@opensourcesolutions.co.uk wrote:
I have updated the original version of this patch to encompass the
feedback comments obtained. Updates include:
1) Rename option to --no-index for consistency with other commands
2) Improved Documentation text
It is very typical for Git newcomers to inadvertently create merges and worst:
inadvertently pushing them. This is one of the reasons many experienced users
prefer to avoid 'git pull', and recommend newcomers to avoid it as well.
To avoid these problems and keep 'git pull' useful, it has been
It is very typical for Git newcomers to inadvertently create merges and
worst, inadvertently pushing them. This is one of the reasons many
experienced users prefer to avoid 'git pull', and recommend newcomers to
avoid it as well.
To avoid these problems and keep 'git pull' useful it has been
Also, deprecate --no-rebase since there's no need for it any more.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-pull.txt | 8 ++--
git-pull.sh| 6 +-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git
Also 'branch.name.rebase' to 'branch.name.pullmode'.
This way 'pull.mode' can be set to 'merge', and the default can be
something else.
The old configurations still work, but get deprecated.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/config.txt | 22
No functional changes.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/merge.c | 11 ++-
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 34a6166..da9fc08 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-pull.sh | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index de57c1d..f53d193 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -48,8 +48,7 @@ if test -z $mode
This is what the code intended.
No functional changes.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/annotate-tests.sh| 2 +-
t/t4200-rerere.sh | 2 +-
t/t9114-git-svn-dcommit-merge.sh | 2 +-
Philip Oakley wrote:
The problem is the file format, in the sense that the earlier `git cat-file
commit $orig` has a human readable output which is a description of the
commit header, rather than the specific binary content.
Ah. That's the actual raw commit object format, though.
The
From: Jonathan Nieder jrnie...@gmail.com
Philip Oakley wrote:
The problem is the file format, in the sense that the earlier `git
cat-file
commit $orig` has a human readable output which is a description of
the
commit header, rather than the specific binary content.
Ah. That's the actual
On Mon, Sep 2, 2013 at 3:11 PM, Johannes Sixt j...@kdbg.org wrote:
Am 31.08.2013 01:55, schrieb Junio C Hamano:
People often find git log --branches etc. that includes _all_
branches is cumbersome to use when they want to grab most but except
some. The same applies to --tags, --all and
From: Matthieu Moy matthieu@grenoble-inp.fr
const char *git_pager(int stdout_is_tty)
{
const char *pager;
if (!stdout_is_tty)
return NULL;
pager = getenv(GIT_PAGER);
if (!pager) {
I've noticed that Git by default puts long output through less as a
pager. I don't like that, but this is not the time to change
established behavior. But while tracking that down, I noticed that
the paging behavior is controlled by at least 5 things:
the -p/--paginate/--no-pager options
Hi,
Dale R. Worley wrote:
That's true, but it would change the effect of using cat as a value:
cat as a value of DEFAULT_PAGER would cause git_pager() to return
NULL, whereas now it causes git_pager() to return cat. (All other
places where cat can be a value are translated to NULL already.)
On 09/02/2013 10:11 PM, Johannes Sixt wrote:
Am 31.08.2013 01:55, schrieb Junio C Hamano:
People often find git log --branches etc. that includes _all_
branches is cumbersome to use when they want to grab most but except
some. The same applies to --tags, --all and --glob.
Teach the revision
On 09/02/2013 07:20 PM, Brad King wrote:
On 09/01/2013 02:08 AM, Junio C Hamano wrote:
Though the refs themeselves cannot be modified together in a single
themselves.
Fixed.
I notice that we are using an array of structures and letting qsort
swap 50~64 bytes of data
Michael suggested
73 matches
Mail list logo
