From: Eli Zaretskii <eliz@gnu.org>
To: Sean Whitton <spwhitton@spwhitton.name>
Cc: juri@linkov.net, 60126@debbugs.gnu.org, dgutov@yandex.ru
Subject: bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes
Date: Fri, 23 Dec 2022 10:16:57 +0200 [thread overview]
Message-ID: <835ye28rgm.fsf@gnu.org> (raw)
In-Reply-To: <878riybwhy.fsf@melete.silentflame.com> (message from Sean Whitton on Thu, 22 Dec 2022 20:59:53 -0700)
> Cc: 60126@debbugs.gnu.org, juri@linkov.net
> From: Sean Whitton <spwhitton@spwhitton.name>
> Date: Thu, 22 Dec 2022 20:59:53 -0700
>
> + ;; Prepare stash commit object, which has a special structure.
> + (let* ((tree-commit (git-string "commit-tree" "-m" message
Can 'message' include newlines? if so, we need to either convert the
newlines to spaces, or invoke the command with -F instead, writing the
message to a temporary file. Because otherwise this will fail on
Windows.
next prev parent reply other threads:[~2022-12-23 8:16 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-16 18:32 bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes Sean Whitton
2022-12-17 17:06 ` Juri Linkov
2022-12-18 0:20 ` Sean Whitton
2022-12-18 1:08 ` Dmitry Gutov
2022-12-19 22:30 ` Sean Whitton
2022-12-20 0:53 ` Dmitry Gutov
2022-12-20 6:43 ` Sean Whitton
2022-12-20 13:47 ` Dmitry Gutov
2022-12-20 16:47 ` Sean Whitton
2022-12-20 15:13 ` Dmitry Gutov
2022-12-20 17:04 ` Sean Whitton
2022-12-20 23:10 ` Sean Whitton
2022-12-20 23:41 ` Sean Whitton
2022-12-20 23:45 ` Dmitry Gutov
2022-12-23 0:12 ` Sean Whitton
2022-12-23 3:59 ` Sean Whitton
2022-12-23 8:16 ` Eli Zaretskii [this message]
2022-12-24 2:03 ` Sean Whitton
2022-12-23 23:18 ` Dmitry Gutov
2022-12-24 2:02 ` Sean Whitton
2022-12-24 14:50 ` Dmitry Gutov
2022-12-24 18:22 ` Sean Whitton
2022-12-24 19:26 ` Dmitry Gutov
2022-12-24 20:10 ` Sean Whitton
2022-12-23 22:55 ` Dmitry Gutov
2022-12-20 17:13 ` Juri Linkov
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=835ye28rgm.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=60126@debbugs.gnu.org \
--cc=dgutov@yandex.ru \
--cc=juri@linkov.net \
--cc=spwhitton@spwhitton.name \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.