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

[PATCH 1/3] rebase: guard against missing files in read_basic_state()

From
Ramkumar Ramachandra <artagnon@gmail.com>
Date
Jun 13, 2013, 16:06 UTC
Message-ID
<1371139573-28047-2-git-send-email-artagnon@gmail.com>
In-Reply-To
<1371139573-28047-1-git-send-email-artagnon@gmail.com>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 git-rebase.sh | 2 ++
 1 file changed, 2 insertions(+)
diff --git a/git-rebase.sh b/git-rebase.sh
index d0c11a9..2122fe0 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -84,6 +84,8 @@ keep_empty=
 test "$(git config --bool rebase.autosquash)" = "true" && autosquash=t
 
 read_basic_state () {
+	test -f "$state_dir/head-name" &&
+	test -f "$state_dir/onto" &&
 	head_name=$(cat "$state_dir"/head-name) &&
 	onto=$(cat "$state_dir"/onto) &&
 	# We always write to orig-head, but interactive rebase used to write to
-- 
1.8.3.1.381.gf08dd97.dirty
Previous: Ramkumar RamachandraNext: Junio C Hamano
Message 2 of 7 in “Fix a couple of edge cases in autostash”
  1. 0/3 Fix a couple of edge cases in autostashRamkumar Ramachandra, Jun 13, 2013
  2. 1/3 rebase: guard against missing files in read_basic_state()Ramkumar Ramachandra, Jun 13, 2013
  3. Junio C HamanoJun 13, 2013
  4. Martin von ZweigbergkJun 16, 2013
  5. Junio C HamanoJun 20, 2013
  6. 2/3 rebase: finish_rebase() in fast-forward rebaseRamkumar Ramachandra, Jun 13, 2013
  7. 3/3 rebase: finish_rebase() in noop rebaseRamkumar Ramachandra, Jun 13, 2013

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.