`git show-branch` is a useful tool to display topics, but when you have
several local topic branches based on different upstream branches, it
can get cumbersome to use the right upstream branch with the right set
of topic branches.
The --upstream flag automatically adds the upstream branch for eve
On Mon, Feb 9, 2015 at 1:12 AM, Michael Haggerty wrote:
> When processing the reflog of a symbolic ref, hold the lock on the
> symbolic reference itself, not on the reference that it points to.
I am not sure if that makes sense.
So when expiring HEAD, you want to have a .git/HEAD.lock file
instea
On Mon, Feb 9, 2015 at 1:12 AM, Michael Haggerty wrote:
> If we are expiring reflog entries for a symbolic reference, then how
> should --updateref be handled if the newest reflog entry is expired?
>
> Option 1: Update the referred-to reference. (This is what the current
> code does.) This doesn'
On Wed, Feb 11, 2015 at 01:15:05AM +0530, Tanay Abhra wrote:
> I just saw your mail late in the night (I didn't had net for a week).
> This patch just squelches the error message, I will take a better
> look tomorrow morning.
Thanks, this is probably a good first step. We can worry about making
t
On Tue, Feb 10, 2015 at 4:05 PM, Jeff King wrote:
> On Tue, Feb 10, 2015 at 03:24:47PM -0800, Stefan Beller wrote:
>
>> On Mon, Feb 9, 2015 at 1:12 AM, Michael Haggerty
>> wrote:
>> > If a reference is missing, its SHA-1 will be null_sha1, which can't
>> > possibly match a new value that ref_tra
On Tue, Feb 10, 2015 at 02:52:23PM -0800, Stefan Beller wrote:
> On Mon, Feb 9, 2015 at 1:12 AM, Michael Haggerty wrote:
> > None of the callers pass NULL to this function, and there doesn't seem
> > to be any usefulness to allowing them to do so.
>
> Usually I'd oppose this change, as it seems
On Tue, Feb 10, 2015 at 03:24:47PM -0800, Stefan Beller wrote:
> On Mon, Feb 9, 2015 at 1:12 AM, Michael Haggerty wrote:
> > If a reference is missing, its SHA-1 will be null_sha1, which can't
> > possibly match a new value that ref_transaction_commit() is trying to
> > update it to. So there is
On Mon, Feb 9, 2015 at 1:12 AM, Michael Haggerty wrote:
> ---all::
> - Instead of listing explicitly, prune all refs.
> +--stale-fix::
> + This revamps the logic -- the definition of "broken commit"
> + becomes: a commit that is not reachable from any of the refs and
> + t
On Mon, Feb 9, 2015 at 1:12 AM, Michael Haggerty wrote:
> Update the "git reflog" usage documentation in the manpage and the
> command help to match the current reality.
>
> Signed-off-by: Michael Haggerty
Reviewed-by: Stefan Beller
> ---
--
To unsubscribe from this list: send the line "unsubsc
On Mon, Feb 9, 2015 at 1:12 AM, Michael Haggerty wrote:
> If a reference is missing, its SHA-1 will be null_sha1, which can't
> possibly match a new value that ref_transaction_commit() is trying to
> update it to. So there is no need to set force_write in this scenario.
>
This commit reverts half
Signed-off-by: Stefan Beller
---
Notes:
When this patch series is applied, you only have 3 occurences of
force_write.
1. In the struct as an undocumented int.
2. In lock_ref_sha1_basic:
if ((flags & REF_NODEREF) && (type & REF_ISSYMREF))
lock->force_writ
On Mon, Feb 9, 2015 at 1:12 AM, Michael Haggerty wrote:
> None of the callers pass NULL to this function, and there doesn't seem
> to be any usefulness to allowing them to do so.
Usually I'd oppose this change, as it seems to be a good defensive
measure. (I cannot assume future me or anybody know
Another go at this XY-Problem...
From: "Philip Oakley"
Sent: Saturday, December 27, 2014 8:17 PM
From: "Johannes Sixt"
Am 27.12.2014 um 19:49 schrieb Philip Oakley:
Hi,
In ee9be06 (perl: detect new files in MakeMaker builds, 2012-07-27)
there is a step to detect if there has been an update
We should reject a patch, whether it renames/copies dir/file to
elsewhere with or without modificiation, or updates dir/file in
place, if "dir/" part is actually a symbolic link to elsewhere,
by making sure that the code to read the preimage does not read
from a path that is beyond a symbolic link.
Because Git tracks symbolic links as symbolic links, a path that
has a symbolic link in its leading part (e.g. path/to/dir/file,
where path/to/dir is a symbolic link to somewhere else, be it
inside or outside the working tree) can never appear in a patch
that validly applies, unless the same patch
We currently read the preimage to apply a patch from the index only
when the --cached option is given. Do so also when the command is
running under the --index option. With --index, the index entry and
the working tree file for a path that is involved in a patch must be
identical, so this should
By default, a patch that affects outside the working area (either a
Git controlled working tree, or the current working directory when
"git apply" is used as a replacement of GNU patch) is rejected as a
mistake (or a mischief). Git itself does not create such a patch,
unless the user bends over ba
Git tracks symbolic links; e.g. you can remove files that have been
tracked in a directory "dir/file*" and then creates a symbolic link
at "dir" to point elsewhere, express such a change as a patchset and
then apply it to the original tree. Consequently, applying a patch
to update dir/file, when y
Christian Couder writes:
> On Sat, Feb 7, 2015 at 9:20 PM, Junio C Hamano wrote:
>
>> Another problem I have with "filter out during the output phase"
>> comes from the semantics/correctness in the resulting code, and I
>> suspect that it would need to be done a lot earlier, before you
>> allow
Christian Couder writes:
> I think that very few new features are now needed to make it possible
> to use the code in other commands like commit, format-patch, am, etc,
> but this patch implements one of the needed features.
>
>> - do "trailer stuff" by calling a central helper that does
>>
Aleksander Boruch-Gruszecki
writes:
> run_setup_gently() is called before merge-file. This may result in changing
> current working directory, which wasn't taken into account when opening a file
> for writing.
>
> Fix by prepending the passed prefix. Previous var is left so that error
> messages
On 10 February 2015 at 09:35, Matthieu Moy wrote:
> Stefan Beller writes:
>
>> If you want email to send via gmail, you can do so by enabling "text
>> only" mode for sending mails.
>
> Unfortunately, it is also a known "bug" that the Android Gmail client
> doesn't have this option (or didn't last
run_setup_gently() is called before merge-file. This may result in changing
current working directory, which wasn't taken into account when opening a file
for writing.
Fix by prepending the passed prefix. Previous var is left so that error
messages keep refering to the file from the user's working
`git_config_parse_key()` is used to sanitize the input key.
Some callers of the function like `git_config_set_multivar_in_file()`
get the per-sanitized key directly from the user so it becomes
necessary to raise an error specifying what went wrong when the entered
key is defective.
Other callers l
Hi,
Quoting Junio C Hamano :
SZEDER Gábor writes:
@@ -412,7 +412,7 @@ __git_refs_remotes ()
__git_remotes ()
{
local i IFS=$'\n' d="$(__gitdir)"
- test -d "$d/remotes" && ls -1 "$d/remotes"
+ test -d "$d/remotes" && ls -1 "$d/remotes" 2>/dev/null
for i in $(git -
Stefan Beller writes:
> On Sun, Feb 8, 2015 at 8:14 AM, Michael Haggerty wrote:
>
>> +# Copyright (c) 2014 Michael Haggerty
>
> What is the projects stance on copyright lines?
I do not think we have a strong one.
> I've seen files (most of them from the beginning) having some copyright lines,
On Tue, Feb 10, 2015 at 10:45:20AM -0800, Junio C Hamano wrote:
> > Unfortunately, it is not so easy. pack_data is a global, and
> > end_packfile calls into other functions which operate on the
> > global directly. We would have to teach each of these to
> > take an argument, and there is no guara
matthew sporleder writes:
> I'm having trouble getting this new patch to apply.
Apply the first one, replace all object_entry_extra with
object_stat, replace all objects_extra with obj_stat and amend the
first one. Then apply this one.
--
To unsubscribe from this list: send the line "unsubscrib
Jeff King writes:
> When an import has finished, we run end_packfile() to
> finalize the data and move the packfile into place. If this
> process fails, we call die() and end up in our die_nicely()
> handler. Which unfortunately includes running end_packfile
> to save any progress we made. We en
On Tue, Feb 10, 2015 at 04:17:47PM +0100, Olaf Hering wrote:
> On Fri, Jan 30, Jeff King wrote:
>
> > I have 8.6.9-3 installed (it is part of Debian testing/unstable now),
> > and confirmed that:
> >
> > diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
> > index 2c16c53..10
SZEDER Gábor writes:
>>> @@ -412,7 +412,7 @@ __git_refs_remotes ()
>>> __git_remotes ()
>>> {
>>> local i IFS=$'\n' d="$(__gitdir)"
>>> - test -d "$d/remotes" && ls -1 "$d/remotes"
>>> + test -d "$d/remotes" && ls -1 "$d/remotes" 2>/dev/null
>>> for i in $(git --git-dir="$d" config
Am 10.02.2015 um 12:46 schrieb Sergey Organov:
> Johannes Sixt writes:
>
>> Am 09.02.2015 um 13:53 schrieb Sergey Organov:
>
> [...]
>
>> If you want a version of --preserve-merges that does what *you* need,
>> consider this commit:
>>
>> git://repo.or.cz/git/mingw/j6t.git rebase-p-first-pare
Stefan Beller writes:
> If you want email to send via gmail, you can do so by enabling "text
> only" mode for sending mails.
Unfortunately, it is also a known "bug" that the Android Gmail client
doesn't have this option (or didn't last time I checked).
--
Matthieu Moy
http://www-verimag.imag.f
On 2015-02-10 11.52, Piotr Krukowiecki wrote:
> On Tue, Feb 10, 2015 at 6:49 AM, Torsten Bögershausen wrote:
>> Which Git versions are you using ?
>
> The one I'm testing currently:
>
> git version 1.7.9 (cygwin)
> git version 1.9.0.msysgit.0 (msys)
> EGit from Eclipse Luna
>
> Cygwin git is a
When you say "skipping", can you be more specific please? What command
line are you using?
If I want to clone the P4 tree at the current revision, I do something like:
$ git p4 clone //depot/sometree/...
That gets me just a single revision.
If I want all revisions back to the start of time, I d
Bash auto completion supplies a function __git_remotes which
lists the git remotes of a repository by reading the
.git/remotes directory. As of git 1.7.6 this is handled
natively by the `git remote` command. This function is
now deprecated.
Signed-off-by: Matt Korostoff
---
*
Great point
On Fri, Jan 30, Jeff King wrote:
> I have 8.6.9-3 installed (it is part of Debian testing/unstable now),
> and confirmed that:
>
> diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
> index 2c16c53..10c777e 100644
> --- a/Documentation/asciidoc.conf
> +++ b/Documentation/ascii
Ping?
On Mon, Jan 26, Olaf Hering wrote:
> ALL_LIBFILES uses wildcard, which provides the result in directory
> order. This order depends on the underlying filesystem on the
> buildhost. To get reproducible builds it is required to sort such list
> before using them.
>
> Signed-off-by: Olaf Heri
Dear All,
I am trying to clone perforce branch from git to my local drive, but it's
skipping too many files and change list while fetching it from perforce.
it'll be very helpful if anyone can suggest me about how to git rid with
this issue.
Thanks in Advance,
Sandeep
--
View this message in
I'm having trouble getting this new patch to apply. Are you working
on a branch that I can track?
On Tue, Feb 10, 2015 at 3:30 AM, Duy Nguyen wrote:
> On Mon, Feb 09, 2015 at 11:27:21AM -0800, Junio C Hamano wrote:
>> > On a 3.4M object repo that's about 53MB. The saving is less impressive
>> >
Johannes Sixt writes:
> Am 09.02.2015 um 13:53 schrieb Sergey Organov:
[...]
> If you want a version of --preserve-merges that does what *you* need,
> consider this commit:
>
> git://repo.or.cz/git/mingw/j6t.git rebase-p-first-parent
>
> Use it like this:
>
> git rebase -i -p --first-parent
On Tue, Feb 10, 2015 at 6:49 AM, Torsten Bögershausen wrote:
> Which Git versions are you using ?
The one I'm testing currently:
git version 1.7.9 (cygwin)
git version 1.9.0.msysgit.0 (msys)
EGit from Eclipse Luna
Cygwin git is a bit old, as I see now. Will try to update later.
> How many peo
On Mon, Feb 09, 2015 at 11:27:21AM -0800, Junio C Hamano wrote:
> > On a 3.4M object repo that's about 53MB. The saving is less impressive
> > compared to index-pack total memory use (about 400MB before delta
> > resolving, so the saving is just 13%)
> >
> > Signed-off-by: Nguyễn Thái Ngọc Duy
> >
43 matches
Mail list logo
