git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / Atom feed
* Supporting untracked files with `git pull --autostash`
@ 2019-04-14 18:20 mqudsi
  0 siblings, 0 replies; only message in thread
From: mqudsi @ 2019-04-14 18:20 UTC (permalink / raw)
  To: git

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



^ permalink raw reply	[flat|nested] only message in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-14 18:20 Supporting untracked files with `git pull --autostash` mqudsi

git@vger.kernel.org list mirror (unofficial, one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox