Ok, thanks for clarifying this.
Philip Oakley philipoak...@iee.org writes:
All of the above are expected and working as designed. Remote
tracking branches are local _copies_ of what you have over there at
the remote repository. The latter is the authoritative version, and
you asked ls-remote
Fix bad translation of Receiving objects.
Signed-off-by: Peter Krefting pe...@softwolves.pp.se
---
po/sv.po | 4 ++--
1 fil ändrad, 2 tillägg(+), 2 borttagningar(-)
Dear Junio,
could you please apply this patch to the 1.7.12 maintenance branch, if
you intend to do more releases past
Junio C Hamano venit, vidit, dixit 01.10.2012 23:09:
Simon Oosthoek s.oosth...@xs4all.nl writes:
It's possible to set PS1 to nothing and print a string from
PROMPT_COMMAND, but then you miss out on all the features of the PS1
interpretation by bash and compared to the use of __git_ps1 at the
On 10/02/2012 09:21 AM, Ramkumar Ramachandra wrote:
Hi,
I've often found the '**' (extended) shell glob useful for matching
any string crossing directory boundaries: it's especially useful if
you only have a toplevel .gitignore, as opposed to a per-directory
.gitignore. Unfortunately,
On 10/02/2012 09:38 AM, Michael J Gruber wrote:
The longer I read your explanation, the less useful the PC mode
sounds like, at least to me. So why does an user even want to use
such a mechanism, instead of PS1? And even if the user wants to use
it by doing \w, \u etc. himself, she can do that
Stefano Lattarini wrote:
On 10/02/2012 09:21 AM, Ramkumar Ramachandra wrote:
Hi,
I've often found the '**' (extended) shell glob useful for matching
any string crossing directory boundaries: it's especially useful if
you only have a toplevel .gitignore, as opposed to a per-directory
Am 10/2/2012 9:51, schrieb Angelo Borsotti:
This is the log of the second execution:
$ emptycommit
+ rm -rf local
+ mkdir local
+ cd local
+ git init
Initialized empty Git repository in d:/gtest/local/.git/
+ echo aaa
+ git add f1
warning: LF will be replaced by CRLF in f1.
The file
Hi
having such a time-dependent behavior is not nice. It means that the user must
know it, and wait patiently before issuing the command, or in a script
add a sleep
before the command.
The choice is then between adding a warning in the man page (please
wait at least
a second before executing the
Another problem caused by BSD v GNU sed, I think.
$ ./t4055-diff-context.sh -i -v
Initialized empty Git repository in /Users/brian/dev/git/t/trash
directory.t4055-diff-context/.git/
expecting success:
cat x -\EOF
firstline
b
c
d
e
f
On Mon, Oct 1, 2012 at 10:38 PM, Shawn Pearce spea...@spearce.org wrote:
On Mon, Oct 1, 2012 at 3:18 PM, Jeff King p...@peff.net wrote:
On Mon, Oct 01, 2012 at 02:23:06PM -0700, Shawn O. Pearce wrote:
When libcurl fails to connect to an SSL server always retry the
request once. Since the
On Wed, Sep 26, 2012 at 1:25 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote:
These files are from rsync.git commit
f92f5b166e3019db42bc7fe1aa2f1a9178cd215d, which was the last commit
before rsync turned GPL-3. All files are imported as-is and
no-op. Adaptation is done in a separate patch.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Just trying to make it clearer, and threw in an article or two.
Also, tried to make the use of tenses a bit more uniform.
As always, best looked at with --color-words or such.
Documentation/RelNotes/1.8.0.txt | 48
When looking through $PATH to try to find an external command,
locate_in_PATH doesn't check that it's trying to execute a file. Add a
check to make sure we won't try to execute a directory.
This also stops us from looking further and maybe finding that the
user meant an alias, as in the case
On Mon, Oct 1, 2012 at 5:48 AM, Nguyen Thai Ngoc Duy pclo...@gmail.com wrote:
Probably off topic. Does saving a list of missing bases in the pack
index help storing thin packs directly? I may be missing some points
because I don't see why thin packs cannot be stored on disk in the
first place.
Refactored the code for binding modified function keys as Junio suggested.
Andrew Wong (2):
gitk: Refactor code for binding modified function keys
gitk: Use bindshiftfunctionkey to bind Shift-F5
gitk | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
--
1.7.12.1.382.gb0576a6
The function includes a workaround for systems where F* keys are mapped
to XF86_Switch_VT_* when modifiers are used.
Signed-off-by: Andrew Wong andrew.k...@gmail.com
---
gitk | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gitk b/gitk
index 379582a..f8f89a5 100755
---
Signed-off-by: Andrew Wong andrew.k...@gmail.com
---
gitk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gitk b/gitk
index f8f89a5..d53fdb2 100755
--- a/gitk
+++ b/gitk
@@ -2501,7 +2501,7 @@ proc makewindow {} {
bindkey ? {dofind -1 1}
bindkey f nextfile
bind .
David Glasser wrote:
Is the newish push.default documented in the git push manpage
anywhere? I don't see it mentioned (and there are several references
to the default behavior), but maybe I'm missing something. Is it
left out on purpose (ie, config values aren't supposed to be mentioned
in
Thanks Rankumar! There's also the reference in the git push origin
example and the This is the default operation mode if no explicit
refspec is found.
(I would have sent my own patch but I can't figure out where the
syntax for the manpages is documented.)
--dave
On Tue, Oct 2, 2012 at 8:09 AM,
Am Dienstag, 2. Oktober 2012, 20:53:28 schrieben Sie:
Hi,
Today I learnt that a gitlink is a commit object embedded in a tree.
However, I can't seem to be able to cat it.
$ git ls-tree HEAD
100644 blob 5a91f388f3648b98ae34a19ec42ba9acc7852ef4.gitmodules
16 commit
On 09/19/2012 08:30 PM, Junio C Hamano wrote:
Torsten Bögershausen tbo...@web.de writes:
is a blob, not a commit is likely to come from validating of the
tag 66f6581d that presumably point at 63499e4; it reads the tag,
learns the name of the object that is tagged and the type of it,
remembers
I ran into a file name parsing issue in git-gui. If I'm in a subfolder and try
to pass a full path to git-gui blame, then git-gui will fail to detect the
argument as a valid path. The first patch will handle this scenario.
The second patch just another issue that I noticed when git-gui fails to
When running git-gui blame from a subfolder (which means prefix is
non-empty), if we pass a full path as argument, the argument parsing
will fail to recognize the argument as a file name, because prefix is
prepended to the argument.
This patch handles that scenario by adding an additional branch
When argument parsing fails to detect a file name, git-gui will try to
use the previously detected head as the file name. We should avoid
prepending the prefix if head looks like a full path.
Signed-off-by: Andrew Wong andrew.k...@gmail.com
---
git-gui.sh | 9 +++--
1 file changed, 7
Ramkumar Ramachandra artag...@gmail.com writes:
David Glasser wrote:
Thanks Rankumar! There's also the reference in the git push origin
example and the This is the default operation mode if no explicit
refspec is found.
Sorry; here's a revised patch.
Sounds good, thanks (resend and Cc
19299a8 (Documentation: Move diff.driver.* from config.txt to
diff-config.txt, 2011-04-07) moved the diff configuration options to
diff-config.txt, but forgot about diff.wordRegex, which was left
behind in config.txt. Fix this.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
Currently, the diff code does not differentiate between an explicit
'--submodule=short' being passed, and no submodule option being passed
on the command line. Making this differentiation will be important
when the command-line option can be used to override a
diff.submoduleFormat configuration
Currently, 'git diff --submodule' displays output with a bold diff
header for non-submodules. So this part is in bold:
diff --git a/file1 b/file1
index 30b2f6c..2638038 100644
--- a/file1
+++ b/file1
For submodules, the header looks like this:
Submodule submodule1
Introduce a diff.submoduleFormat configuration variable corresponding
to the '--submodule' command-line option of 'git diff'.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
Documentation/diff-config.txt|7 +++
Documentation/diff-options.txt |3 ++-
diff.c
Michael J Gruber g...@drmicha.warpmail.net writes:
Junio C Hamano venit, vidit, dixit 01.10.2012 23:09:
Confused
The problem (as far as I see) is only: What user interface do we want
to expose to the user, or rather, do we want to expose the user to ;)
So far, we say:
#1) Copy
Michael J Gruber g...@drmicha.warpmail.net writes:
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Just trying to make it clearer, and threw in an article or two.
Also, tried to make the use of tenses a bit more uniform.
Thanks.
Documentation/RelNotes/1.8.0.txt | 48
Matthieu Moy matthieu@grenoble-inp.fr writes:
Ramkumar Ramachandra artag...@gmail.com writes:
David Glasser wrote:
Thanks Rankumar! There's also the reference in the git push origin
example and the This is the default operation mode if no explicit
refspec is found.
Sorry; here's a
Matt McClellan mcclellan...@gmail.com writes:
I've done this using git add --interactive then reverting a files
changes, though the actual crime was done using egit staging tool. It
seems the command line won't let you unstage changes but gui tools and
interactive tools seem to allow it.
I
Junio C Hamano gits...@pobox.com writes:
Matthieu Moy matthieu@grenoble-inp.fr writes:
Ramkumar Ramachandra artag...@gmail.com writes:
David Glasser wrote:
Thanks Rankumar! There's also the reference in the git push origin
example and the This is the default operation mode if no
Johannes Sixt j.s...@viscovery.net writes:
Note that git commit -m A --allow-empty *DID* create a commit. Only, that
it received the same name (SHA1) as the commit you created before it
because it had the exact same contents (files, parents, author, committer,
and timestamps). Obviously, your
Carlos Martín Nieto c...@elego.de writes:
When looking through $PATH to try to find an external command,
locate_in_PATH doesn't check that it's trying to execute a file. Add a
check to make sure we won't try to execute a directory.
This also stops us from looking further and maybe finding
Ramkumar Ramachandra artag...@gmail.com writes:
Hi,
Today I learnt that a gitlink is a commit object embedded in a tree.
However, I can't seem to be able to cat it.
$ git ls-tree HEAD
100644 blob 5a91f388f3648b98ae34a19ec42ba9acc7852ef4.gitmodules
16 commit
Wayne Davison way...@samba.org writes:
On Tue, Oct 2, 2012 at 7:07 AM, Ævar Arnfjörð Bjarmason
ava...@gmail.comwrote:
Perhaps Wayne Davison (added to CC) wouldn't mind giving us permission to
use the subsequent changes to these files under the GPLv2?
There have been no changes in the
Ramkumar Ramachandra artag...@gmail.com writes:
David Glasser wrote:
Thanks Rankumar! There's also the reference in the git push origin
example and the This is the default operation mode if no explicit
refspec is found.
Sorry; here's a revised patch.
--8--
FYI: the above is not a
Brian Charles Gernhardt gernh...@cs.rochester.edu writes:
Another problem caused by BSD v GNU sed, I think.
Oh, that again X-.
Will patch up in a stupid-but-trivial way, unless somebody knows a
reliable workaround.
Thanks.
--
To unsubscribe from this list: send the line unsubscribe git in
the
Junio C Hamano gits...@pobox.com writes:
Brian Charles Gernhardt gernh...@cs.rochester.edu writes:
Another problem caused by BSD v GNU sed, I think.
Oh, that again X-.
Will patch up in a stupid-but-trivial way, unless somebody knows a
reliable workaround.
I no longer have a BSD handy to
Brian Charles Gernhardt gernh...@cs.rochester.edu writes:
Another problem caused by BSD v GNU sed, I think.
git cat-file blob HEAD:x |
sed /preline/a\
ADDED x
Actually, I think what is happening is that inside , the backslash
at the end of line is eaten by the shell
Thanks Junio! Note that I think the word is usually spelled
controlled not controled.
On Tue, Oct 2, 2012 at 11:34 AM, Junio C Hamano gits...@pobox.com wrote:
Ramkumar Ramachandra artag...@gmail.com writes:
David Glasser wrote:
Thanks Rankumar! There's also the reference in the git push
David Glasser glas...@davidglasser.net writes:
Thanks Junio! Note that I think the word is usually spelled
controlled not controled.
Thanks; I cannot spelll...
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo
Junio C Hamano gits...@pobox.com writes:
Brian Charles Gernhardt gernh...@cs.rochester.edu writes:
Another problem caused by BSD v GNU sed, I think.
git cat-file blob HEAD:x |
sed /preline/a\
ADDED x
Actually, I think what is happening is that inside , the backslash
at
Am 02.10.2012 18:51, schrieb Ramkumar Ramachandra:
Currently, the diff code does not differentiate between an explicit
'--submodule=short' being passed, and no submodule option being passed
on the command line. Making this differentiation will be important
when the command-line option can be
Hi Junio,
if I put on my head the implementor's hat, I would agree with you: that command
after all behaves as implemented.
However, if I put the user's hat I would reason differently. What I
need are predictable
commands, and that by all means is not. This because the time at which a command
is
Peter Krefting pe...@softwolves.pp.se writes:
a fix for the most embarrasing typo in the Swedish translation
(Receiveing became Deleting). The fix is already in the big
pull-request slated for the next feature release, but I would
appreciate if a 1.17.12.3 did contain this...
Surely, and
Junio C Hamano gits...@pobox.com writes:
Carlos Martín Nieto c...@elego.de writes:
When looking through $PATH to try to find an external command,
locate_in_PATH doesn't check that it's trying to execute a file. Add a
check to make sure we won't try to execute a directory.
This also stops
Am 02.10.2012 18:51, schrieb Ramkumar Ramachandra:
Introduce a diff.submoduleFormat configuration variable corresponding
to the '--submodule' command-line option of 'git diff'.
Nice. Maybe a better name would be diff.submodule, as this sets the
default for the --submodule option of diff?
And I
On 02/10/12 19:01, Junio C Hamano wrote:
If your goal is to use PROMPT_COMMAND and not PS1, then yes between
the two definitions of PROMPT_COMMAND above, the latter may look
simpler. But that does not explain why you want to prefer it over
PS1 in the first place, which was the central point
Angelo Borsotti angelo.borso...@gmail.com writes:
Usually recording a commit that has the exact same tree as its sole
parent commit is a mistake, and the command prevents you from making
such a commit. This option bypasses the safety, and is primarily for
use by foreign SCM interface scripts.
c...@elego.de (Carlos Martín Nieto) writes:
How about something like this instead? We keep the access check and only
do the stat call when we have found something we want to look at.
Sounds safer.
Looking at the way the stat call is indented twice, I suspect that
the variable can be defined
Simon Oosthoek s.oosth...@xs4all.nl writes:
... This is
prevented (and quite the norm in static PS1 strings) by enclosing the
terminal code for color inside \[ and \] so bash doesn't count these and
what is in between them in the length of the prompt string.
Ah, OK, and these \[ things \]
Torsten Bögershausen tbo...@web.de writes:
With help of Junio's comments I probably found the reason why the test
behaves differently:
The objects are checked in a certain order, based on the inode number.
Which seems to be the same on most machines: when files are created
in a certain
On Tue, Oct 02, 2012 at 09:32:11PM +0200, Carlos Martín Nieto wrote:
@@ -101,8 +102,9 @@ static char *locate_in_PATH(const char *file)
}
strbuf_addstr(buf, file);
- if (!access(buf.buf, F_OK))
+ if (!stat(buf.buf, st) !S_ISDIR(st.st_mode)) {
Hi Junio,
It does create one; it just is the same one you already happen to have,
when you record the same state on top of the same history as the
same person at the same time.
No, it does not create one: as you can see from the trace of the execution
of my script, the sha of the commit is
Junio C Hamano gits...@pobox.com writes:
The last piece to expect error in tag.*broken links in the output
is wrong. Probably we should remove the misguided check and end
it with test_must_fail git fsck --tags.
I think this should suffice.
When we check tag T first, we make a mental note on
e...@thyrsus.com (Eric S. Raymond) writes:
The CIA notification server died about two days ago, done in by
a screwup at the cloud service hosting is VM. For various technical
reasons there cannot and will not be any effort to revive it. If you want
the whole sordid tale, read CIA and the
Junio C Hamano gits...@pobox.com:
Seeing the above without a signed-off patch and then this on cia.vc
We intend to have the CIA.VC Site running soon then bring the
service back at a later date! We currently do not have an ETA for
the Service but hope to have it functioning soon!
Hi,
I've noticed that the p4merge shell script could do with some
improvement when it comes to merging. Because p4merge throws up an
error when one of the files it's given to diff is /dev/null, git needs
to create a temporary empty file and pass that to p4merge when diffing a
file that has
return-path: off...@motylek.com
Claudio.canovastudioclaudiocanova. Http://nimubuh.esugar.org/
--
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
Jeremy Morton ad...@game-point.net writes:
I've noticed that the p4merge shell script could do with some
improvement when it comes to merging. Because p4merge throws up an
error when one of the files it's given to diff is /dev/null, git
needs to create a temporary empty file and pass that to
On Tue, Oct 2, 2012 at 2:56 PM, Angelo Borsotti
angelo.borso...@gmail.com wrote:
Hi Junio,
It does create one; it just is the same one you already happen to have,
when you record the same state on top of the same history as the
same person at the same time.
No, it does not create one: as
Am 10/2/2012 23:56, schrieb Angelo Borsotti:
The problem I am trying to solve is to push to a remote server the
source files only,
while keeping in the local repo both sources and binaries. To do it, I
keep an orphan
branch, [...]
# this is the commit on the master branch
git init
echo
65 matches
Mail list logo
