git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[RFC] Add warning when git discard changes on another branch?

From
YRYubin Ruan <ablacktshirt@gmail.com>
Date
May 7, 2017, 23:35 UTC
Message-ID
<20170507233512.GA9332@HP>

Hi, I think it would be better if git can warn use if we switch to another branch without committing the modification. Git will warn if the modification is based on a commit different from where the checkout happened.

For example, say I am now on branch 'master' and all files *clean*. Now if I do:
    $ git checkout -b issue
and make some changes to a file:
    $ echo "modification on branch issue" >> lala.txt
and then switch back to branch 'master':
    $ git checkout master
and git can see the changes:
    $ git status
      On branch master
      Changes not staged for commit:
        (use "git add <file>..." to update what will be committed)
        (use "git checkout -- <file>..." to discard changes in working directory)
      
      	modified:   lala.txt
      
      no changes added to commit (use "git add" and/or "git commit -a")
      
Now, if I do "git checkout -- lala.txt", then I will lose that change on branch
'issue' too!!! 
If, on branch 'issue', the changes to 'lala.txt' are based on a commit different
from where the checkout happened, i.e.
     
    on branch 'master'
        |
        |  <-- git checkout -b issue
         \
          \  <-- modification to git happened on a commit different from where
                 the checkout happened
then git would warn us something like this:
    error: Your local changes to the following files would be overwritten by checkout:
    	lala.txt
    Please, commit your changes or stash them before you can switch branches.
    Aborting

So, I think it is better to add some similar warinings if the modification happened on a commit the *same* as where the checkout happened, i.e.

    on branch 'master'
        |
        |  <-- git checkout -b issue
           <-- modification to git happened on a commit different from where
               the checkout happened
I already lost some of my work by this ...

(p.s please add me to the Cc because I am not in this list) --- Yubin

Next: Junio C Hamano
Message 1 of 9 in “[RFC] Add warning when git discard changes on another branch?”
  1. Yubin RuanMay 7, 2017
  2. Junio C HamanoMay 8, 2017
  3. Yubin RuanMay 8, 2017
  4. Junio C HamanoMay 8, 2017
  5. Yubin RuanMay 8, 2017
  6. Junio C HamanoMay 8, 2017
  7. Yubin RuanMay 8, 2017
  8. Junio C HamanoMay 8, 2017
  9. Yubin RuanMay 8, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.