git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: mqudsi@neosmart.net
To: git@vger.kernel.org
Subject: Supporting untracked files with `git pull --autostash`
Date: Sun, 14 Apr 2019 18:20:13 +0000	[thread overview]
Message-ID: <0101016a1d14099f-4ac42e38-256a-42a2-94d3-430417d74a25-000000@us-west-2.amazonses.com> (raw)

Hello,

Just a quick request for an enhancement to the behavior of the following
command:

    git pull --autostash --rebase

When executed with local, untracked files that would conflict with newly-added
files upstream, e.g.

An untracked local file `master:/foo` would be overwritten by a recently tracked
file `origin/master:/foo`.

Currently, the following occurs:

```
mqudsi@devpc > git pull --autostash --rebase
First, rewinding head to replay your work on top of it...
error: The following untracked working tree files would be overwritten by
checkout:
        tests/eval.err
		tests/eval.in
		tests/eval.out
```

where

```
mqudsi@devpc > git status --porcelain=v2 | grep eval
? tests/eval.err
? tests/eval.in
? tests/eval.out
```

As currently `--autostash` only applies to files that are tracked by git, and
files not in the index are ignored.

(Additionally, with this change it makes sense to enable `--autostash` to be used
with a plain `git pull` without necessary also including `--rebase`, but I can
live without it!)

Thank you,

Mahmoud Al-Qudsi
NeoSmart Technologies



                 reply	other threads:[~2019-04-14 18:20 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0101016a1d14099f-4ac42e38-256a-42a2-94d3-430417d74a25-000000@us-west-2.amazonses.com \
    --to=mqudsi@neosmart.net \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).