From: Junio C Hamano gits...@pobox.com
Thomas Rast tr...@inf.ethz.ch writes:
Hrm, you're right, that's a flaw in my logic. You could do the same in
all other cases too, e.g. replace a tree so that an entry is of a
different type and at the same time change the type of the object
itself.
With nd/magic-pathspec I get the following failure on Windows in
t2016-checkout-patch.sh:
expecting success:
set_state dir/foo work head
# the third n is to get out in case it mistakenly does not apply
(echo y; echo n; echo n) | (cd dir git checkout -p foo)
David Aguilar dav...@gmail.com writes:
I have a poor imagination and cannot imagine why it needs to be
switchable.
I could not either, but I found the reason in the commit message:
eff80a9fd990
Some users do want to write a line that begin with a pound sign, #,
in their commit log
Jens Lehmann jens.lehm...@web.de writes:
But I'm not terribly happy about having the --for-status option in the
submodule script in the first place, as I believe it should rather be
handled by wt-status.c itself (reading the output of submodule summary
using the
Junio C Hamano gits...@pobox.com writes:
* sb/repack-in-c (2013-08-22) 3 commits
- repack: rewrite the shell script in C (squashing proposal)
- repack: retain the return value of pack-objects
- repack: rewrite the shell script in C
Just a ping to make sure the series is not forgotten.
On 08/29/2013 09:20 AM, Matthieu Moy wrote:
it's time to send the squashed and hopefully final version.
I will do so tonight.
Thanks,
Stefan
signature.asc
Description: OpenPGP digital signature
I just stumbled over the git status -uno form, and it took me some
time to realize that no was a parameter to -u, rather than aggregated
(and undocumented) -n and -o.
Whereas the manpage does document the -u[mode] syntax, which dissipate
the misunderstanding, --help output does not, listing -u in
Hi folks,
any chance this patch can be merged?
Gr.
Matthijs
On Tue, Jun 18, 2013 at 06:38:10PM +0200, Matthijs Kooijman wrote:
This allows git-svn to prompt for a keyring unlock password, when a
the needed gnome keyring is locked.
This requires changes in the subversion perl bindings
On Thu, Aug 29, 2013 at 1:54 PM, Johannes Sixt j.s...@viscovery.net wrote:
With nd/magic-pathspec I get the following failure on Windows in
t2016-checkout-patch.sh:
expecting success:
set_state dir/foo work head
# the third n is to get out in case it mistakenly does not
On Wed, Aug 28, 2013 at 9:52 PM, Matthijs Kooijman matth...@stdin.nl wrote:
Hi Nguy,
On Fri, Aug 16, 2013 at 04:52:05PM +0700, Nguyễn Thái Ngọc Duy wrote:
upload-pack has a special rev walking code for shallow recipients. It
works almost like the similar code in pack-objects except:
1. in
On Wed, Aug 28, 2013 at 11:02 PM, Matthijs Kooijman matth...@stdin.nl wrote:
This is a testcase that checks for a problem where, during a specific
shallow fetch where the client does not have any commits that are a
successor of the new shallow root (i.e., the fetch creates a new
detached piece
Hi!
I am writing a pre-hook script, which will be responsible for checking style
(formatting/indenting) of the C source code. The script at the beginning
executes git diff --name-only -z --cached HEAD in order to get all the
committed changes, then it makes a two copies of the staged file, one
It should not be necessary to re-specify --separate-git-dir when
re-initialising a git repo.
$ git init --separate-git-dir ../repo
Initialized empty Git repository in /home/infinity0/tmp/repo/
$ git init
/home/infinity0/tmp/wtree/.git/refs: Not a directory
1
One big motivation is so git init
On Thu, Aug 29, 2013 at 01:39:02PM +0100, Ximin Luo wrote:
It should not be necessary to re-specify --separate-git-dir when
re-initialising a git repo.
$ git init --separate-git-dir ../repo
Initialized empty Git repository in /home/infinity0/tmp/repo/
$ git init
On Thu, Aug 29, 2013 at 8:54 AM, Johannes Sixt j.s...@viscovery.net wrote:
It looks like on Windows we disallow arguments that contain double-quote,
colon, or asterisk, and otherwise wrap arguments in double-quotes if they
contain space. Then pass them through qx{}, which I can only guess what
So, here's a reroll that makes the code cleaner.
First patches are cleanups without behavioral changes, only the last
one does something new.
I'm waiting for more comments to decide what to do with the
configuration option. Right now, my preference would be to call it
status.oldStyle and default
Signed-off-by: Matthieu Moy matthieu@imag.fr
---
builtin/stripspace.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/stripspace.c b/builtin/stripspace.c
index e981dfb..1259ed7 100644
--- a/builtin/stripspace.c
+++ b/builtin/stripspace.c
@@ -89,11 +89,11 @@
No behavior change, but two slight code reorganization: argv_array_push
doesn't accept NULL strings, and duplicates its argument hence
summary_limit must be written to before being inserted into argv.
Signed-off-by: Matthieu Moy matthieu@imag.fr
---
wt-status.c | 26
The --for-status option was an undocumented option used only by
wt-status.c, which inserted a header and commented out the output. We can
achieve the same result within wt-status.c, without polluting the
submodule command-line options.
This will make it easier to disable the comments from
Historically, git status needed to prefix each output line with '#' so
that the output could be added as comment to the commit message. This
prefix comment has no real purpose when git status is ran from the
command-line, and this may distract users from the real content.
Allow the user to
Add a --stdin signature to read update instructions from standard input
and apply multiple ref updates and deletes together.
Signed-off-by: Brad King brad.k...@kitware.com
---
Documentation/git-update-ref.txt | 19 +++-
builtin/update-ref.c | 93
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
acquire locks on all refs with verified old values. Then update or
delete all refs
Get it out of the way for a future refs.h function.
Signed-off-by: Brad King brad.k...@kitware.com
---
builtin/reset.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/reset.c b/builtin/reset.c
index afa6e02..789ee48 100644
--- a/builtin/reset.c
+++
Factor loose ref deletion into helper function delete_ref_loose to allow
later use elsewhere. While at it, rename local names 'flag = type' and
'delopt = flags' for consistency with callers and called functions.
Signed-off-by: Brad King brad.k...@kitware.com
---
refs.c | 24
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
Expose lock_ref_sha1_basic's type_p argument to callers of
lock_any_ref_for_update. Update all call sites to ignore it; we will
use it later.
Signed-off-by: Brad King brad.k...@kitware.com
---
branch.c |2 +-
builtin/commit.c |2 +-
builtin/fetch.c|2 +-
Hi Folks,
While thinking about some how some server-side branch management
services might work, I came across a need to update multiple refs
locked with verified old values simultaneously. For example, to
transfer ownership of some commits by rewinding a branch and creating
a new branch at the
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.
Signed-off-by: Brad King brad.k...@kitware.com
---
refs.c | 28
The @author_initials feature Jakub added in a36817b claims to use a
i18n regexp (/\b([[:upper:]])\B/g), but in Perl this doesn't actually
do anything unless the string being matched against has the UTF8 flag.
So as a result it abbreviates me to AB not ÆAB. Here's something
that demonstrates the
[Ævar, sorry for duplication but I accidentally send HTML email; stupid Gmail]
On Thu, Aug 29, 2013 at 4:26 PM, Ævar Arnfjörð Bjarmason
ava...@gmail.com wrote:
The @author_initials feature Jakub added in a36817b claims to use a
i18n regexp (/\b([[:upper:]])\B/g), but in Perl this doesn't
So the remote-helpers can tell us when a forced push was needed.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
transport-helper.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/transport-helper.c b/transport-helper.c
index 62051a6..95dd72e 100644
---
We don't want to pass arguments specific to fast-export to
setup_revisions.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/fast-export.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index
Hi,
Here are the patches that allow transport helpers to be completely transparent;
renaming branches, deleting them, custom refspecs, --force, --dry-run,
reporting forced update, everything works.
Some of these were were sent before and rejected without a reason, but here
they are again in case
Otherwise they cannot know when to force the push or not (other than
hacks).
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
transport-helper.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/transport-helper.c b/transport-helper.c
index 63cabc3..62051a6 100644
---
So that we can covert the exported ref names.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-fast-export.txt | 4
builtin/fast-export.c | 30 ++
t/t9350-fast-export.sh| 7 +++
3 files changed, 41
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-fast-import.txt | 3 +++
fast-import.c | 13 ++---
t/t9300-fast-import.sh| 18 ++
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git
By using fast-export's new --refspec option.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t5801-remote-helpers.sh | 2 +-
transport-helper.c| 13 ++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/t/t5801-remote-helpers.sh
For remote-helpers that use 'export' to push.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t5801-remote-helpers.sh | 8
transport-helper.c| 11 ++-
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/t/t5801-remote-helpers.sh
The remote helper namespace should not be updated.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
transport-helper.c | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index 5490796..9bbf209 100644
---
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/fast-export.c | 14 ++
t/t9350-fast-export.sh | 11 +++
2 files changed, 25 insertions(+)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 7f314f0..9b728ca 100644
---
On Thursday, August 29, 2013 08:11:48 am Brad King wrote:
fatal: Unable to create 'lock': File exists.
If no other git process is currently running, this
probably means a git process crashed in this repository
earlier. Make sure no other git process is running and
remove the file
So I set out to verify in the code that the order of priority of pager
specification is
GIT_PAGER core.pager PAGER default
I discovered that there is also a pager.command configuration
variable.
I was expecting the code to be simple, uniform (with regard to the 5
sources), and reasonably
From: Junio C Hamano gits...@pobox.com
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index b1630ba..33fbd8c 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -28,11 +28,15 @@ two blob objects, or changes between two files on disk.
On 08/29/2013 11:32 AM, Martin Fick wrote:
On Thursday, August 29, 2013 08:11:48 am Brad King wrote:
fatal: Unable to create 'lock': File exists.
If no other git process is currently running, this
probably means a git process crashed in this repository
earlier. Make sure no other
wor...@alum.mit.edu (Dale R. Worley) writes:
const char *git_pager(int stdout_is_tty)
{
const char *pager;
if (!stdout_is_tty)
return NULL;
pager = getenv(GIT_PAGER);
if (!pager) {
if
Christian Couder chrisc...@tuxfamily.org writes:
But if all the objects that point to an object, called O, are to be
replaced, then in most cases object O probably doesn't need to be
replaced. It's probably sufficient to create the new object, called
O2, that would replace object O and to
Matthieu Moy matthieu@imag.fr writes:
... Right now, my preference would be to call it
status.oldStyle and default it to false (i.e. change the behavior, but
allow old-timers to get back the old one).
Sounds sensible, at least to me.
--
To unsubscribe from this list: send the line
Brad King brad.k...@kitware.com writes:
Nor should it in this case. I was saying that the front-end
needs to reject duplicate ref names from the stdin lines before
trying to lock the ref twice to avoid this message.
How about trying not to feed duplicates?
--
To unsubscribe from this list:
On Thu, Aug 29, 2013 at 04:26:29PM +0200, Ævar Arnfjörð Bjarmason wrote:
I haven't gotten an env where I can test gitweb running, but that
looks like it should work to me.
I've tested the patch and it works fine.
Tested-by: Simon Ruderich si...@ruderich.org
Regards
Simon
--
+ privacy is
Duy Nguyen pclo...@gmail.com writes:
On Thu, Aug 29, 2013 at 01:39:02PM +0100, Ximin Luo wrote:
It should not be necessary to re-specify --separate-git-dir when
re-initialising a git repo.
$ git init --separate-git-dir ../repo
Initialized empty Git repository in /home/infinity0/tmp/repo/
On 08/29/2013 12:21 PM, Junio C Hamano wrote:
Brad King brad.k...@kitware.com writes:
needs to reject duplicate ref names from the stdin lines before
trying to lock the ref twice to avoid this message.
How about trying not to feed duplicates?
Sure, perhaps it is simplest to push the
Brad King brad.k...@kitware.com writes:
Get it out of the way for a future refs.h function.
Readers do not know if update_refs() is a good name for that
future refs.h function at this point, so evict squatter is not a
very good justification by itself. I do agree that this static
function is
Brad King brad.k...@kitware.com writes:
Expose lock_ref_sha1_basic's type_p argument to callers of
lock_any_ref_for_update. Update all call sites to ignore it; we will
use it later.
...
diff --git a/branch.c b/branch.c
index c5c6984..c244483 100644
--- a/branch.c
+++ b/branch.c
@@
Brad King brad.k...@kitware.com writes:
Factor loose ref deletion into helper function delete_ref_loose to allow
later use elsewhere. While at it, rename local names 'flag = type' and
'delopt = flags' for consistency with callers and called functions.
Signed-off-by: Brad King
Brad King brad.k...@kitware.com writes:
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
Brad King brad.k...@kitware.com writes:
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
acquire locks on all refs with verified
Matthijs Kooijman matth...@stdin.nl wrote:
Hi folks,
any chance this patch can be merged?
It's probably fine. Does anybody else have testing/feedback? I haven't
used git-svn/SVN in years, and I don't use GNOME (nor much GUI).
--
To unsubscribe from this list: send the line unsubscribe git
Edward Rudd ur...@outoforder.cc wrote:
Where is a link to the latest patch? I can give it a quick once-over
with one of my git-svn'ed game ports I'm working on. (due for
launching on the 10th.. WOOHOO!)
http://mid.gmane.org/1371573490-21973-1-git-send-email-matth...@stdin.nl
Thanks!
--
To
Hi,
It has been discussed many times in the past that 'index' is not an
appropriate description for what the high-level user does with it, and
it has been agreed that 'staging area' is the best term.
The term 'staging area' is more intuitive for newcomers which are more
familiar with English
On 08/29/2013 01:17 PM, Junio C Hamano wrote:
Brad King brad.k...@kitware.com writes:
Get it out of the way for a future refs.h function.
Readers do not know if update_refs() is a good name for that
future refs.h function at this point, so evict squatter is not a
very good justification
On 08/29/2013 01:22 PM, Junio C Hamano wrote:
If you are passing an NULL as a new parameter, please spell it
NULL, not 0.
Fixed at all updated call sites.
-Brad
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo
On 08/29/2013 01:28 PM, Junio C Hamano wrote:
Brad King brad.k...@kitware.com writes:
-if (!(flag REF_ISPACKED) || flag REF_ISSYMREF) {
+if (!(type REF_ISPACKED) || type REF_ISSYMREF) {
Hits from git grep REF_IS tell me that all users of REF_IS* symbol
that check if a bit is on
On 08/29/2013 01:34 PM, Junio C Hamano wrote:
Brad King brad.k...@kitware.com writes:
+if(i == n)
Style:
if (i == n)
Fixed in next revision.
-Brad
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo
Thomas Ackermann th.ac...@arcor.de writes:
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
Documentation/user-manual.txt | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/Documentation/user-manual.txt
Looks 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/majordomo-info.html
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-stage.txt| 5 +++
builtin/stage.c| 74 ++
contrib/completion/git-completion.bash | 4 +-
3 files changed, 82 insertions(+), 1 deletion(-)
diff
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-stage.txt| 45 +
Makefile | 2 +-
builtin.h | 1 +
builtin/stage.c| 52
Thomas Ackermann th.ac...@arcor.de writes:
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
Documentation/user-manual.txt | 16 +++-
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index
Thomas Ackermann th.ac...@arcor.de writes:
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
Documentation/user-manual.txt | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index
Looks 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/majordomo-info.html
Hi,
Some commands (git diff) already have the --staged alias, this patch series
document them, and do the same for the rest.
Also, add a --work (and --no-work) option, so that in addition to --stage, we
can replace --cached in 'git apply'.
The old options remain unchanged.
Felipe Contreras
Synonym for --cached.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-diff.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 78d6d50..646e5cd 100644
---
Synonym for --cached.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-grep.txt | 5 -
builtin/grep.c | 2 ++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index
Synonym for --cached.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-rm.txt | 5 -
builtin/rm.c | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index 1d876c2..156b40d 100644
--no-stage is synonym for --keep-index.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-stash.txt | 6 +++---
git-stash.sh| 8 +++-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-stash.txt
Synonym for --cached.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-submodule.txt | 8 ++--
git-submodule.sh| 10 +-
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-submodule.txt
Synonym of --index.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-stash.txt | 8
git-stash.sh| 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index
Synonym for --index.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-apply.txt | 5 -
builtin/apply.c | 2 ++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/completion/git-completion.bash | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 5da920e..4adc4ed 100644
---
'git apply', 'git apply --index', 'git apply --cached' do different
things, but what they do is not precisely clear, specially since no
other commands has similar distinctions.
With --no-work (--work being the default), it's clear what the option
would do; modify, or not, the working directory.
On 08/29/2013 01:39 PM, Junio C Hamano wrote:
Brad King brad.k...@kitware.com writes:
+for (i=0; i n; ++i) {
Style:
for (i = 0; i n; i++) {
Fixed.
Is it asking for AB-BA deadlock? If so, is the caller responsible
for avoiding it?
Since we don't actually block waiting for
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-reset.txt | 8
builtin/reset.c | 20
2 files changed, 28 insertions(+)
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index f445cb3..5cd75a8 100644
Hi,
This patch series is not really necessary for the whole --stage series, but it
makes sense while we are at it.
Felipe Contreras (3):
reset: add --stage and --work options
reset: allow --keep with --stage
completion: update 'git reset' new stage options
Documentation/git-reset.txt
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-reset.txt | 2 +-
builtin/reset.c | 13 ++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 5cd75a8..a1419c9
On 08/29/2013 02:07 PM, Junio C Hamano wrote:
I didn't mean to force the caller of new update-ref --stdin; the
new code you wrote for it is what feeds the input to update_refs()
function, and that is one place you can make sure you do not lock
yourself out.
Besides, if you get two updates
Brad King brad.k...@kitware.com writes:
On 08/29/2013 01:39 PM, Junio C Hamano wrote:
Brad King brad.k...@kitware.com writes:
+ for (i=0; i n; ++i) {
Style:
for (i = 0; i n; i++) {
Fixed.
Is it asking for AB-BA deadlock? If so, is the caller responsible
for avoiding it?
Brad King brad.k...@kitware.com writes:
+ const char *c, *s, *oldvalue, *value[2] = {0,0};
This patch has many style issues of the same kind, lack of a SP at
places where there should be between operators and after comma.
--
To unsubscribe from this list: send the line unsubscribe git in
Felipe Contreras felipe.contre...@gmail.com writes:
It has been discussed many times in the past that 'index' is not an
appropriate description for what the high-level user does with it, and
it has been agreed that 'staging area' is the best term.
add is the verb, not index (which is a noun
Felipe Contreras felipe.contre...@gmail.com writes:
+COMMANDS
+
+
+With no arguments, it's a synonym for linkgit:git-add[1].
This would not be very useful since git add errors out when called
without arguments ;-).
The accurate description of your code would be closer to When the
Felipe Contreras felipe.contre...@gmail.com writes:
+index are left intact. Same with `--no-stage`, which is a snynonym.
s/snynonym/synonym/
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
On 08/29/2013 02:32 PM, Junio C Hamano wrote:
But it may not be a bad idea to keep the callers dumb and have this
function always sort, dedup, *and* fail inconsistent request.
I agree. I was just starting to write the comment for update_refs
and it basically would have said always use
Felipe Contreras felipe.contre...@gmail.com writes:
@@ -629,6 +657,7 @@ def do_import(parser):
print feature import-marks=%s % path
print feature export-marks=%s % path
print feature force
+print feature notes
The remaining patches in the series seem reasonable, but
Matthieu Moy wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
+'edit'::
+
+Manually edit the staging area (as a diff).
+
That sounds interesting. It reminds me git add --edit, but they are
different ('stage edit' edits the patch with HEAD, 'add --edit' edits
the patch
Felipe Contreras felipe.contre...@gmail.com writes:
It has been discussed many times in the past that 'index' is not an
appropriate description for what the high-level user does with it, and
it has been agreed that 'staging area' is the best term.
Thanks for working on this. No time for a
Matthieu Moy wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
+COMMANDS
+
+
+With no arguments, it's a synonym for linkgit:git-add[1].
This would not be very useful since git add errors out when called
without arguments ;-).
Right.
The accurate description of
Signed-off-by: Matthieu Moy matthieu@imag.fr
---
I prefer not to bother with compatibility of git-remote-mediawiki with
older Git versions. The recommanded way is to install Git and
git-remote-mediawiki from the same source tree. People who want to
keep an old Git version can still use old
Matthieu Moy matthieu@imag.fr writes:
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
---
Thanks; will queue all four.
--
To unsubscribe from this list: send the line unsubscribe git
Matthieu Moy wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
It has been discussed many times in the past that 'index' is not an
appropriate description for what the high-level user does with it, and
it has been agreed that 'staging area' is the best term.
Thanks for working
On Thu, Aug 29, 2013 at 1:58 PM, Matthieu Moy matthieu@imag.fr wrote:
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
Felipe Contreras felipe.contre...@gmail.com writes:
Matthieu Moy wrote:
These explanations make sense. I think it would be better to put part of
it in commit messages, so that future contributors can git blame the
doc/implem of these --stage and find them (i.e. avoid the
misunderstanding
1 - 100 of 143 matches
Mail list logo
