Junio C Hamano wrote:
What is wrong with git describe? Is this cheaper, or am I missing something?
I think what you are missing is that the detached from is not
about your current HEAD after you flipped it around with many resets
and commits. It is about what tag or what specific commit you
On 06/13/2013 10:22 AM, Thomas Rast wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
One race is still possible and undetected: another process could
change the file from a regular file into a symlink between the call to
lstat and the call to open(). The open() call would silently
The following bug has been observed:
$ git am # no input file
^C
$ git am --abort
Resolve operation not in progress, we are not resuming.
This happens because the following test fails:
test -d $dotest test -f $dotest/last test -f $dotest/next
and the codepath for an am in-progress
[1/2] is now equipped to handle any am invocation in the presence of a
stray $dotest directory.
[2/2] is a while we're there.
Thanks.
Ramkumar Ramachandra (2):
am: handle stray $dotest directory
t/am: use test_path_is_missing() where appropriate
git-am.sh | 14 ++
Replace instances of ! test -d with test_path_is_missing.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
t/t4150-am.sh | 34 +-
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 6c2cc3e..5edb79a 100755
The files $g/rebase-{merge,apply}/{head-name,msgnum,end} are not
guaranteed to exist. When attempting to cat them, squelch the error
output.
In addition to guarding against stray directories, this patch addresses
a real problem:
# on terminal 1
$ git rebase -i master
# ignore editor, and
On Fri, Jun 07, 2013 at 11:47:07AM -0700, Junio C Hamano wrote:
Scott McPeak smcp...@coverity.com writes:
I suggest that this problem could easily have been avoided if git
stash refused to run with a pending merge (present MERGE_HEAD file),
since this is crucial repository state that it
It's trivial to support the feature :)
Ramkumar Ramachandra (2):
pull: respect rebase.autostash
pull: clarify the large { ... } form
git-pull.sh | 7 +--
t/t5520-pull.sh | 11 +++
2 files changed, 16 insertions(+), 2 deletions(-)
--
1.8.3.1.379.gb74074e.dirty
--
To
If a rebasing pull is requested, pull unconditionally runs
require_clean_worktree() resulting in:
# dirty worktree or index
$ git pull
Cannot pull with rebase: Your index contains uncommitted changes.
Please commit or stash them.
It does this to inform the user early on that a rebase
Remove the large { ... } form, as the block can be confused with a
function block. Use a simple if-condition instead. No functional
changes.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
git-pull.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
Ramkumar Ramachandra artag...@gmail.com writes:
-test true = $rebase {
+if test true = $rebase; then
Use a newline, not a ';'.
See CodingGuideLines:
- Do not write control structures on a single line with semicolon.
then should be on the next line for if statements, and do
should be
Ramkumar Ramachandra artag...@gmail.com writes:
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -44,6 +44,7 @@ merge_args= edit=
curr_branch=$(git symbolic-ref -q HEAD)
curr_branch_short=${curr_branch#refs/heads/}
rebase=$(git config --bool branch.$curr_branch_short.rebase)
+autostash=$(git
Hi,
On Thu, Jun 13, 2013 at 12:19 PM, Thomas Adam tho...@xteddy.org wrote:
So these guidelines gain the community nothing, and only serve to punish
those who are already following them, without them being written down,
because the root-cause of the problem is still here, and isn't going to go
From: Benoit Person benoit.per...@ensimag.fr
Updates the code to make it more easy to switch mediawiki version when
testing. Before that, the version number was partly hardcoded, partly
in a var.
Signed-off-by: Benoit Person benoit.per...@ensimag.fr
Signed-off-by: Matthieu Moy
Hi,
So, I've taken Junio's suggestion and designed a proper command-line
interface for 'git stash store' in this iteration:
git stash store [-m message] [-e error] commit
The error string will be passed through eval_gettext before it is
printed. Otherwise, the idea is the same: to clean up
Add a note saying that the user probably wants save in the create
description. While at it, document that it can optionally take a
message in the synopsis.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
Documentation/git-stash.txt | 3 ++-
1 file changed, 2 insertions(+), 1
rebase has no reason to know about the implementation of the stash. In
the case when applying the autostash results in conflicts, replace the
relevant code in finish_rebase () to simply call 'git stash store'.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
git-rebase.sh | 6 +-
save_stash() contains the logic for doing two potentially independent
operations; the first is preparing the stash merge commit, and the
second is updating the stash ref/ reflog accordingly. While the first
operation is abstracted out into a create_stash() for callers to access
via 'git stash
The option parser for create unnecessarily checks $1 inside a case
statement that matches $1 in the first place.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
git-stash.sh | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/git-stash.sh b/git-stash.sh
index
Matthieu Moy wrote:
It would be nice to have an --autostash command-line option too,
I thought it would be a bit ugly, since it's already overloaded with
options to pass to merge.
and the
error message in require_clean_work_tree could suggest using it. That
would make the feature easily
Matthieu Moy wrote:
Use a newline, not a ';'.
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
Am 07.06.2013 22:21, schrieb Constantine A. Murenin:
I'm totally fine with daily updates; but I think there still has to be
some better way of doing this than wasting 0.5s of CPU time and 5s of
HDD time (if completely cold) for each blame / log, at the price of
more storage and some pre-caching,
On Fri, Jun 14, 2013 at 6:41 AM, Ramkumar Ramachandra
artag...@gmail.com wrote:
Matthieu Moy wrote:
It would be nice to have an --autostash command-line option too,
I thought it would be a bit ugly, since it's already overloaded with
options to pass to merge.
Eventually I think a switch will
On Fri, Jun 14, 2013 at 4:56 AM, Ramkumar Ramachandra
artag...@gmail.com wrote:
If a rebasing pull is requested, pull unconditionally runs
require_clean_worktree() resulting in:
# dirty worktree or index
$ git pull
Cannot pull with rebase: Your index contains uncommitted changes.
On Fri, Jun 14, 2013 at 8:12 AM, Phil Hord phil.h...@gmail.com wrote:
On Fri, Jun 14, 2013 at 4:56 AM, Ramkumar Ramachandra
artag...@gmail.com wrote:
If a rebasing pull is requested, pull unconditionally runs
require_clean_worktree() resulting in:
# dirty worktree or index
$ git pull
On Fri, Jun 14, 2013 at 6:32 AM, Ramkumar Ramachandra
artag...@gmail.com wrote:
Add a note saying that the user probably wants save in the create
description. While at it, document that it can optionally take a
message in the synopsis.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
On Fri, Jun 14, 2013 at 06:13:33PM +0530, Ramkumar Ramachandra wrote:
The following command
$ git format-patch -o outgoing master
does not ensure that the output-directory outgoing doesn't already
exist. As a result, it's possible for patches from two different series
to get mixed up
Hi,
just some questions about your patch.
On Fri, Jun 14, 2013 at 06:13:33PM +0530, Ramkumar Ramachandra wrote:
The following command
$ git format-patch -o outgoing master
does not ensure that the output-directory outgoing doesn't already
exist. As a result, it's possible for patches
John Keeping wrote:
I don't think this is the correct behaviour. I can think of cases where
I would want to output multiple things into the same directory.
format.cleanOutputDirectory = true|false?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
Since the early preview, I realized that peel_committish() is required
in exactly two places: the onto and upstream parsers facing
end-user data. Updated appropriately.
Thanks.
Ramkumar Ramachandra (3):
t/rebase: add failing tests for a peculiar revision
sh-setup: add new peel_committish()
The revisions specified on the command-line as onto and upstream
arguments could be of the form :/quuxery; so, use peel_committish() to
resolve them. The failing tests in t/rebase and t/rebase-interactive
now pass.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
git-rebase.sh
The following commands fail, even if :/quuxery and :/foomery resolve to
perfectly valid commits:
$ git rebase [-i] --onto :/quuxery :/foomery
This is because rebase [-i] attempts to rev-parse ${REV}^0 to verify
that the given revision resolves to a commit. Add tests to document
these
The normal way to check whether a certain revision resolves to a valid
commit is:
$ git rev-parse --verify $REV^0
Unfortunately, this does not work when $REV is of the type :/quuxery.
Write a helper to work around this limitation.
Suggested-by: Junio C Hamano gits...@pobox.com
Signed-off-by:
On Fri, Jun 14, 2013 at 06:45:19PM +0530, Ramkumar Ramachandra wrote:
John Keeping wrote:
I don't think this is the correct behaviour. I can think of cases where
I would want to output multiple things into the same directory.
format.cleanOutputDirectory = true|false?
Maybe, but I was
Fredrik Gustafsson wrote:
However I think this patch can improve the workflow for experienced
developers. Can we tweak this in some way to get the best out of both
worlds?
The main problem is that output-directory can be an absolute path
(like ~, in the extreme case). I'm not sure how to
Phil Hord wrote:
nit: adds a period where there was not one previously.
Stripped periods in both, 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
On Fri, Jun 14, 2013 at 07:04:18PM +0530, Ramkumar Ramachandra wrote:
Fredrik Gustafsson wrote:
However I think this patch can improve the workflow for experienced
developers. Can we tweak this in some way to get the best out of both
worlds?
The main problem is that output-directory can
On Fri, Jun 14, 2013 at 07:04:18PM +0530, Ramkumar Ramachandra wrote:
My main itch is that completion doesn't work with my fp:
alias.fp = !rm -rf outgoing git format-patch -M -C -o outgoing
Why not define your custom completion function for this alias in your
.bashrc?
_git_fp () {
From: Célestin Matte celestin.ma...@ensimag.fr
A new version of this series of patch, to make it mergeable with next.
Changes with v5:
- Fix a bug in [21/31]
- Build on top of next so that it's mergeable
Changes with v4:
- fixed typos
- Change in [21/31]: all the processing is done within the
From: Célestin Matte celestin.ma...@ensimag.fr
Perl's split function takes a regex pattern argument. You can also
feed it an expression, which is then compiled into a regex at runtime.
It therefore works to pass your pattern via single quotes, but it is
much less obvious to a reader that the
From: Célestin Matte celestin.ma...@ensimag.fr
Put first parameter of map inside a block, for better readability.
Follow BuiltinFunctions::RequireBlockMap
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr
---
From: Célestin Matte celestin.ma...@ensimag.fr
%basetimestamps declaration was lost in the middle of subroutines
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr
---
contrib/mw-to-git/git-remote-mediawiki.perl | 6 +++---
1 file
From: Célestin Matte celestin.ma...@ensimag.fr
Follow Subroutines::RequireFinalReturn
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr
---
contrib/mw-to-git/git-remote-mediawiki.perl | 18 ++
1 file changed, 18
From: Célestin Matte celestin.ma...@ensimag.fr
Change '[\n]' to '\n': brackets are useless here.
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr
---
contrib/mw-to-git/git-remote-mediawiki.perl | 2 +-
1 file changed, 1
From: Célestin Matte celestin.ma...@ensimag.fr
m// and // is used randomly. It is better to use the m modifier only when
needed, e.g., when the regexp uses another separator than //.
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr
Ramkumar Ramachandra artag...@gmail.com writes:
Junio C Hamano wrote:
What is wrong with git describe? Is this cheaper, or am I missing
something?
I think what you are missing is that the detached from is not
about your current HEAD after you flipped it around with many resets
and
From: Célestin Matte celestin.ma...@ensimag.fr
A split ' ' is turned into a split / /, which changes its behaviour: the
old method matched a run of whitespaces (/\s*/), while the new one will match a
single space, which is what we want here. Indeed, in other contexts,
changing split(' ') to
From: Célestin Matte celestin.ma...@ensimag.fr
Subroutines' parameters should be assigned to variable before doing anything
else
Besides, existing instruction affected a variable inside a if, which break
Git's coding style
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by:
From: Célestin Matte celestin.ma...@ensimag.fr
Local variable $url has the same name as a global variable. Changing the name
of the local variable prevents future possible misunderstanding.
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy
From: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr
---
contrib/mw-to-git/git-remote-mediawiki.perl | 26 +-
1 file changed, 13 insertions(+), 13 deletions(-)
diff
From: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr
---
contrib/mw-to-git/git-remote-mediawiki.perl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
From: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr
---
contrib/mw-to-git/git-remote-mediawiki.perl | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
From: Célestin Matte celestin.ma...@ensimag.fr
Non-trivial numeric values (e.g., different from 0, 1 and 2) are placed in
constants at the top of the code to be easily modifiable and to make more sense
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy
From: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr
---
contrib/mw-to-git/git-remote-mediawiki.perl | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git
From: Célestin Matte celestin.ma...@ensimag.fr
In subroutine parse_command, error messages were not correct. For the import
function, having too much or incorrect arguments displayed both
invalid arguments, while it displayed too many arguments for the option
functions under the same conditions.
From: Célestin Matte celestin.ma...@ensimag.fr
Such a file allows to configure perlcritic.
Here, it is used to remove many unwanted rules and configure one to
remove unwanted warnings.
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy
From: Célestin Matte celestin.ma...@ensimag.fr
Use {}{} instead of /// when slashes are used inside the regexp so as not to
escape it.
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr
---
contrib/mw-to-git/git-remote-mediawiki.perl
From: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr
---
contrib/mw-to-git/git-remote-mediawiki.perl | 1 -
1 file changed, 1 deletion(-)
diff --git
From: Célestin Matte celestin.ma...@ensimag.fr
@$var structures are re-written in the following way: @{$var}
It makes them more readable.
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr
---
From: Célestin Matte celestin.ma...@ensimag.fr
In this regexp, ' |\n' is used, whereas its equivalent '[ \n]', which is
clearer, is used elsewhere. Make the style coherent.
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr
---
From: Célestin Matte celestin.ma...@ensimag.fr
Follow perlcritic's InputOutput::RequireEncodingWithUTF8Layer policy
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr
---
contrib/mw-to-git/git-remote-mediawiki.perl | 6 +++---
1 file
From: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr
---
contrib/mw-to-git/git-remote-mediawiki.perl | 56 -
1 file changed, 32 insertions(+), 24 deletions(-)
From: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr
---
contrib/mw-to-git/git-remote-mediawiki.perl | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
From: Célestin Matte celestin.ma...@ensimag.fr
Explicitly assign local variable $/ as undef and make a proper
one-instruction-by-line indentation
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr
---
SZEDER Gábor wrote:
_git_fp () { _git_format_patch ; }
Good stopgap, 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
From: Célestin Matte celestin.ma...@ensimag.fr
- strings which don't need interpolation are single-quoted for more clarity and
slight gain of performance
- interpolation is preferred over concatenation in many cases, for more clarity
- variables are always used with the ${} operator inside
From: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr
---
contrib/mw-to-git/git-remote-mediawiki.perl | 1 -
1 file changed, 1 deletion(-)
diff --git
From: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr
---
contrib/mw-to-git/git-remote-mediawiki.perl | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
From: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr
---
contrib/mw-to-git/git-remote-mediawiki.perl | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
From: Célestin Matte celestin.ma...@ensimag.fr
Empty strings are replaced by an $EMPTY constant.
Signed-off-by: Célestin Matte celestin.ma...@ensimag.fr
Signed-off-by: Matthieu Moy matthieu@grenoble-inp.fr
---
contrib/mw-to-git/git-remote-mediawiki.perl | 18 ++
1 file
From: Célestin Matte celestin.ma...@ensimag.fr
This follows the following rule:
InputOutput::RequireBracedFileHandleWithPrint (Severity: 1)
The `print' and `printf' functions have a unique syntax that supports an
optional file handle argument. Conway suggests wrapping this argument in
Fredrik Gustafsson wrote:
git format-patch always creates a new directory like:
.git/outgoing/[patchname]FROM commit short sha1...TO commit short sha1
and possible runs a custom command afterwards. Like cd to the patch
directory, open the cover-letter in your editor etc.
git send-email
John Keeping j...@keeping.me.uk writes:
On Fri, Jun 14, 2013 at 06:13:33PM +0530, Ramkumar Ramachandra wrote:
The following command
$ git format-patch -o outgoing master
does not ensure that the output-directory outgoing doesn't already
exist. As a result, it's possible for patches
John Keeping j...@keeping.me.uk writes:
On Fri, Jun 14, 2013 at 06:45:19PM +0530, Ramkumar Ramachandra wrote:
John Keeping wrote:
I don't think this is the correct behaviour. I can think of cases where
I would want to output multiple things into the same directory.
On Thu, Jun 13, 2013 at 08:15:59PM +0530, Ramkumar Ramachandra wrote:
SZEDER Gábor wrote:
Just curious: when do those files don't exist? When using an older
version of git with a newer prompt, obviously, but are there other
cases?
# On terminal one
$ git rebase --interactive master
Junio C Hamano wrote:
The part you stripped from your quote looked like this:
Apologies for the lack of clarity.
You were at 1.8.2 but no longer are, so in the following sequence:
$ git checkout v1.8.2
$ git status
$ git reset --hard HEAD^
$ git status
the former would
Ramkumar Ramachandra artag...@gmail.com writes:
So, I've taken Junio's suggestion and designed a proper command-line
interface for 'git stash store' in this iteration:
git stash store [-m message] [-e error] commit
I am perplexed; that would not something I _would_ design or
suggest. The
Ramkumar Ramachandra artag...@gmail.com writes:
In this example, it is inconsequential whether I run:
$ git checkout v1.8.2^
or:
$ git checkout v1.8.2
$ git reset --hard @^
as far as describe is concerned. It will give me the same good
consistent answer in either case.
Yes,
Makes sense. Thanks, will queue.
--
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
Fredrik Gustafsson iv...@iveqy.com writes:
Many git submodule operations do not work on a submodule at a path whose
name is not in ASCII.
Thanks. A suggestion to add some more explanation to the log
message follows.
This is because git ls-files is used to find which paths are bound to
Ramkumar Ramachandra artag...@gmail.com writes:
The following bug has been observed:
$ git am # no input file
^C
$ git am --abort
Resolve operation not in progress, we are not resuming.
This happens because the following test fails:
test -d $dotest test -f $dotest/last test
Junio C Hamano wrote:
As I said (twice), you can argue that that particular piece of
information is not useful (at least to you), but why it is not
useful has to be justified, against the justification given by
b397ea4863a1 (status: show more info than currently not on any
branch, 2013-03-13)
Ramkumar Ramachandra artag...@gmail.com writes:
+ die $(eval_gettext Stray $dotest directory found.
+Use \git am --abort\ to remove it.)
$dotest, or \$dotest?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
Junio C Hamano wrote:
These two case arms are indented one level too deep (will locally
touch up).
Thanks. Can you tell me how to get shell-script-mode to indent the
case statement properly? (I used the default indentation)
--
To unsubscribe from this list: send the line unsubscribe git in
the
Phil Hord phil.h...@gmail.com writes:
DESCRIPTION
---
@@ -151,6 +151,7 @@ create::
Create a stash (which is a regular commit object) and return its
object name, without storing it anywhere in the ref namespace.
+ This is probably not what you want to use;
Junio C Hamano wrote:
$dotest, or \$dotest?
Works fine for me like this. Why do we escape the dollar in the other strings?
--
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
Junio C Hamano wrote:
git stash store [-m message] [-e error] commit
I am perplexed; that would not something I _would_ design or
suggest. The -e error looks especially odd, in that -e
usually refers to something the command evaluates (e.g. sed, perl),
but more importantly if the caller
Junio C Hamano gits...@pobox.com writes:
+# Possible stray $dotest directory
+if test -d $dotest; then
+case $skip,$resolved,$abort in
+,,t)
+rm -fr $dotest
+exit 0
+;;
+*)
+
Ramkumar Ramachandra artag...@gmail.com writes:
Junio C Hamano wrote:
$dotest, or \$dotest?
Works fine for me like this. Why do we escape the dollar in the other
strings?
The reason would become clear once you think what string you are
feeding eval_gettext with if you do not escape. The
Philip Oakley wrote:
Is there a proper name for this style of revision specification? I've been
letting this 'style' wash over me in the hope that I'd understand
eventually, but it hasn't.
See gitrevisions(7). None of them have any names.
Loking at git-rev-parse I now see that it might be
I'm having a problem with git add in version 1.7.7.6.
The situation is that I have a repository that is contained in a
second-level directory, a sub-sub-directory of /. The core.worktree
of the repository is /, so the working directory is the entire file
tree. I want this repository to track
Ramkumar Ramachandra artag...@gmail.com writes:
Junio C Hamano wrote:
As I said (twice), you can argue that that particular piece of
information is not useful (at least to you), but why it is not
useful has to be justified, against the justification given by
b397ea4863a1 (status: show more
From: Ramkumar Ramachandra artag...@gmail.com
Sent: Friday, June 14, 2013 5:18 PM
Philip Oakley wrote:
Is there a proper name for this style of revision specification? I've
been
letting this 'style' wash over me in the hope that I'd understand
eventually, but it hasn't.
See gitrevisions(7).
Ramkumar Ramachandra artag...@gmail.com writes:
The revisions specified on the command-line as onto and upstream
arguments could be of the form :/quuxery; so, use peel_committish() to
resolve them. The failing tests in t/rebase and t/rebase-interactive
now pass.
You can also specify the
Ramkumar Ramachandra artag...@gmail.com writes:
Junio C Hamano wrote:
And then the message triggers at the second test in t3420 when
applied on top of 587947750bd7 (rebase: implement --[no-]autostash
and rebase.autostash, 2013-05-12) or 45acb7592825 (Merge branch
'rr/rebase-autostash',
Ramkumar Ramachandra artag...@gmail.com writes:
Junio C Hamano wrote:
The reason would become clear once you think what string you are
feeding eval_gettext with if you do not escape. The translators
translate a fixed string (possibly with placeholders) to a fixed
translated string (possibly
Fredrik Gustafsson iv...@iveqy.com writes:
... The
correct approach to solve the problem for all pathnames may be to use
ls-files -z and tell the Perl script that reads its output to read NUL
separated records by using $/ = \0.
I've tentatively queued the attached without 2/2; the scriptlet
If the user's git config defines commit.template then include the
contents of that file in the log buffer by default.
In git-setup-log-buffer, instead of supplying the default commit
message insert the user's commit.template.
Signed-off-by: Curt Brune c...@brune.net
---
contrib/emacs/git.el |
Jeff King p...@peff.net writes:
Apache 2.4 recently shipped in Debian unstable, and I noticed that all
of the git httpd tests stopped working. It turns out that some
configuration directives have changed between 2.2 and 2.4, and the httpd
server would not start at all.
With this series, the
Curt Brune c...@brune.net writes:
If the user's git config defines commit.template then include the
contents of that file in the log buffer by default.
In git-setup-log-buffer, instead of supplying the default commit
message insert the user's commit.template.
Signed-off-by: Curt Brune
1 - 100 of 129 matches
Mail list logo